• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 876d1d79
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    876d1d79
vc1_parser.c 5.46 KB