• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8bf95e8b
    Michael Niedermayer authored
    * qatar/master:
      avc: Add a function for converting mp4 style extradata to annex b
      pthread: free progress if buffer allocation failed.
      lavc/avconv: support changing frame sizes in codecs with frame mt.
      libavformat: Document who sets the AVStream.id field
      utvideo: mark output picture as keyframe.
      sunrast: Add support for negative linesize.
      vp8: fix update_lf_deltas in libavcodec/vp8.c
      ralf: read Huffman code lengths without GetBitContext
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/sunrastenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8bf95e8b
ffmpeg.c 194 KB