• 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
vorbisdec.c 61.1 KB