• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c065255b
    Michael Niedermayer authored
    * qatar/master:
      aacenc: Fix LONG_START windowing.
      aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
      avplay: use the correct array size for stride.
      lavc: extend doxy for avcodec_alloc_context3().
      APIchanges: mention avcodec_alloc_context()/2/3
      avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
      aacsbr: ARM NEON optimised sbrdsp functions
      aacsbr: align some arrays
      aacsbr: move some simdable loops to function pointers
      cosmetics: Remove extra newlines at EOF
    
    Conflicts:
    	libavcodec/utils.c
    	libavfilter/formats.c
    	libavutil/mem.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c065255b
Name
Last commit
Last update
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...