• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2af8f2ce
    Michael Niedermayer authored
    * qatar/master: (27 commits)
      cmdutils: use new avcodec_is_decoder/encoder() functions.
      lavc: make codec_is_decoder/encoder() public.
      lavc: deprecate AVCodecContext.sub_id.
      libcdio: add a forgotten AVClass to the private context.
      swscale: remove "cpu flags" from -sws_flags description.
      proresenc: give user a possibility to alter some encoding parameters
      vorbisenc: add output buffer overwrite protection
      libopencore-amrnbenc: fix end-of-stream handling
      ra144enc: fix end-of-stream handling
      nellymoserenc: zero any leftover packet bytes
      nellymoserenc: use proper MDCT overlap delay
      qpeg: Use bytestream2 functions to prevent buffer overreads.
      swscale: make %rep unconditional.
      vp8: convert simple loopfilter x86 assembly to use named arguments.
      vp8: convert idct x86 assembly to use named arguments.
      vp8: convert mc x86 assembly to use named arguments.
      vp8: convert loopfilter x86 assembly to use cpuflags().
      vp8: convert idct/mc x86 assembly to use cpuflags().
      swscale: remove now unnecessary hack.
      x86inc: don't "bake" stack_offset in named arguments.
      ...
    
    Conflicts:
    	cmdutils.c
    	doc/APIchanges
    	libavcodec/mpeg12.c
    	libavcodec/options.c
    	libavcodec/qpeg.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavdevice/libcdio.c
    	tests/lavf-regression.sh
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2af8f2ce
mpegvideo_parser.c 7.2 KB