• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6071e4d8
    Michael Niedermayer authored
    * qatar/master:
      v410dec: Check for sufficient input data. Fixes crash
      fate: Add v210 codec regression tests
      mpegts: adjustable minimum PES payload
      mpegts: properly output large audio packets
      avformat: Add SMJPEG demuxer.
      Indeo 4 decoder
    
    Conflicts:
    	doc/general.texi
    	libavcodec/v410dec.c
    	libavcodec/version.h
    	libavformat/mpegtsenc.c
    	libavformat/smjpeg.c
    	libavformat/version.h
    	tests/codec-regression.sh
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6071e4d8
Changelog 30.6 KB