• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6101e532
    Michael Niedermayer authored
    * qatar/master:
      rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
      asfdec: Add an option for not searching for the packet markers
      cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
      cosmetics: Align codec declarations
      cosmetics: Convert mimic.c to utf-8
      avconv: remove an unused function parameter.
      avconv: remove now pointless variables.
      avconv: drop support for building without libavfilter.
      nellymoserenc: fix crash due to memsetting the wrong area.
      libavformat: Only require first packet to be known for audio/video streams
      avplay: Don't try to scale timestamps if the tb isn't set
    
    Conflicts:
    	Changelog
    	configure
    	ffmpeg.c
    	libavcodec/aacenc.c
    	libavcodec/bmpenc.c
    	libavcodec/dnxhddec.c
    	libavcodec/dnxhdenc.c
    	libavcodec/ffv1.c
    	libavcodec/flacenc.c
    	libavcodec/fraps.c
    	libavcodec/huffyuv.c
    	libavcodec/libopenjpegdec.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/pamenc.c
    	libavcodec/pgssubdec.c
    	libavcodec/pngenc.c
    	libavcodec/qtrleenc.c
    	libavcodec/rawdec.c
    	libavcodec/sgienc.c
    	libavcodec/tiffenc.c
    	libavcodec/v210dec.c
    	libavcodec/wmv2dec.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6101e532
mjpegbdec.c 5.62 KB