• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 75a37b57
    Michael Niedermayer authored
    * qatar/master:
      APIchanges: fill in date and commit for request_sample_fmt
      Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
      Add support for request_sample_format in ffmpeg and ffplay.
      Add APIchanges entry for request_sample_fmt.
      Add request_sample_fmt field to AVCodecContext.
      Add float_interleave() to FmtConvertContext with x86-optimized versions.
      Remove unused make variable SEEK_REFFILE
      fate: remove redundant aref and vref references
      fate: remove do_ffmpeg_nocheck function
      fate: do not collect -benchmark output
      mpegaudiodec: remove decode_end() function
      fate: run aref and vref as regular tests
      mpegaudio: sanitise compute_antialias_* names
      mpeg12: add slice-threading checks to slice-threading initializers.
      h264: copy pixel_shift between slice threading contexts.
      mdec: enable frame-level multithreading.
      mdec.c: fix overread.
    
    Conflicts:
    	libavcodec/aacdec.c
    	libavcodec/ac3dec.c
    	libavcodec/avcodec.h
    	libavcodec/dca.c
    	libavcodec/h264.c
    	libavcodec/mdec.c
    	libavcodec/mpeg12.c
    	libavcodec/options.c
    	libavcodec/version.h
    	libavcodec/vorbisdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    75a37b57
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
ffserver.h Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...