Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Aug 2011 23:29:40 +0000 (01:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Aug 2011 23:29:40 +0000 (01:29 +0200)
* qatar/master:
  vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
  mpeg12: propagate chunk decode errors and fix conditional indentation
  vc1: fix VC-1 Pulldown handling.
  VC1: Fix first/last row checks with slices
  mp4: Handle non-trivial ES Descriptors.
  vc1: properly zero coded_block[] edges on new slice entry.

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12.c
libavcodec/vc1.c
libavcodec/vc1_parser.c
libavcodec/vc1dec.c
libavcodec/vp6.c
libavformat/isom.c
libavformat/isom.h
libavformat/mov.c
libavformat/mpegts.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge