1. 20 Dec, 2011 2 commits
    • Tomas Härdin's avatar
      mxfdec: Ignore the last entry in Avid's index table segments · 085249a3
      Tomas Härdin authored
      The last entry is the total size of the essence container.
      Previously a TemporalOffset error would be logged, even though segments like
      these are expected.
      085249a3
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 0edf7ebc
      Michael Niedermayer authored
      * qatar/master:
        h264: clear trailing bits in partially parsed NAL units
        vc1: Handle WVC1 interlaced stream
        xl: Fix overreads
        mpegts: rename payload_index to payload_size
        segment: introduce segmented chain muxer
        lavu: add AVERROR_BUG error value
        avplay: clear pkt_temp when pkt is freed.
        qcelpdec: K&R formatting cosmetics
        qcelpdec: cosmetics: drop some pointless parentheses
        x86: conditionally compile dnxhd encoder optimizations
        Revert "h264: skip start code search if the size of the nal unit is known"
        swscale: fix formatting and indentation of unscaled conversion routines.
        h264: skip start code search if the size of the nal unit is known
        cljr: fix buf_size sanity check
        cljr: Check if width and height are positive integers
      
      Conflicts:
      	libavcodec/cljr.c
      	libavcodec/vc1dec.c
      	libavformat/Makefile
      	libavformat/mpegtsenc.c
      	libavformat/segment.c
      	libswscale/swscale_unscaled.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      0edf7ebc
  2. 19 Dec, 2011 25 commits
  3. 18 Dec, 2011 13 commits