Merge remote-tracking branch 'qatar/master'

* 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>

diff --cc libavcodec/mpeg12.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1_parser.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/vp6.c
Simple merge

diff --cc libavformat/isom.c
Simple merge

diff --cc libavformat/isom.h
Simple merge

diff --cc libavformat/mov.c
Simple merge

diff --cc libavformat/mpegts.c
Simple merge