Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Use defines for sample flags in fragments
  mov: Use defines for trun flags
  mov: Use defines for tfhd flags
  proresenc: force bitrate not to exceed given limit
  vc1parse: call vc1_init_common().
  wma: don't return 0 on invalid packets.
  asf: prevent packet_size_left from going negative if hdrlen > pktlen.
  mjpegb: don't return 0 at the end of frame decoding.
  rtpdec: Identify incorrectly signalled H263
  vp8dsp: split long line.
  aiff: don't skip block_align==0 check on COMM-after-SSND files.
  dpcm: ignore extra unpaired bytes in stereo streams.
  mp3on4: require a minimum framesize.
  mpc7: assign an error level + context to av_log() msg.
  huffyuv: error out on bit overrun.
  dct-test: Add the missing ff_ prefix to the altivec functions
  dct-test: Remove a stray declaration of a nonexistent function
  movenc: Write the unknown duration as 64 bit fields in ismv
  movenc: Write track durations with all bits set if duration is unknown

Conflicts:
	libavcodec/dct-test.c
	libavcodec/wmadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dct-test.c
Simple merge

diff --cc libavcodec/dpcm.c
Simple merge

diff --cc libavcodec/huffyuv.c
Simple merge

diff --cc libavcodec/mjpegbdec.c
Simple merge

diff --cc libavcodec/mpc7.c
Simple merge

diff --cc libavcodec/mpegaudiodec.c
Simple merge

diff --cc libavcodec/proresenc_kostya.c
Simple merge

diff --cc libavcodec/vc1.h
Simple merge

diff --cc libavcodec/vc1_parser.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/vp8dsp.h
Simple merge

diff --cc libavcodec/wmadec.c
index 7d7cc7f,b9fc21f..c90e22c
--- 1/libavcodec/wmadec.c
--- 2/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@@ -834,10 -817,13 +834,14 @@@ static int wma_decode_superframe(AVCode
          s->last_superframe_len = 0;
          return 0;
      }
-     if (buf_size < s->block_align)
-         return AVERROR(EINVAL);
+     if (buf_size < s->block_align) {
+         av_log(avctx, AV_LOG_ERROR,
+                "Input packet size too small (%d < %d)\n",
+                buf_size, s->block_align);
+         return AVERROR_INVALIDDATA;
+     }
 -    buf_size = s->block_align;
 +    if(s->block_align)
 +        buf_size = s->block_align;
  
      init_get_bits(&s->gb, buf, buf_size*8);
  

diff --cc libavformat/aiffdec.c
Simple merge

diff --cc libavformat/asfdec.c
Simple merge

diff --cc libavformat/isom.h
Simple merge

diff --cc libavformat/mov.c
Simple merge

diff --cc libavformat/movenc.c
Simple merge

diff --cc libavformat/rtpdec_formats.h
Simple merge

diff --cc libavformat/rtpdec_h263.c
Simple merge

diff --cc tests/ref/lavf/ismv
index 5922cb6,0000000..cf0a583
mode 100644,000000..100644
--- 1/tests/ref/lavf/ismv
--- /dev/null
+++ b/tests/ref/lavf/ismv
@@@ -1,9 -1,0 +1,9 @@@
- c4e12d7ed2ab47d43b912eb160a2bea8 *./tests/data/lavf/lavf.ismv
- 312247 ./tests/data/lavf/lavf.ismv
++eb116b60befadfd5c9118635d81c5a6e *./tests/data/lavf/lavf.ismv
++312271 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xbcc963fc
- 44c724f5dd12436d283aacc95065ad7f *./tests/data/lavf/lavf.ismv
- 321521 ./tests/data/lavf/lavf.ismv
++90db70a6f33cf22db9ce242087b5870b *./tests/data/lavf/lavf.ismv
++321545 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0x3998478f
- c4e12d7ed2ab47d43b912eb160a2bea8 *./tests/data/lavf/lavf.ismv
- 312247 ./tests/data/lavf/lavf.ismv
++eb116b60befadfd5c9118635d81c5a6e *./tests/data/lavf/lavf.ismv
++312271 ./tests/data/lavf/lavf.ismv
 +./tests/data/lavf/lavf.ismv CRC=0xbcc963fc