1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 67235dfa1d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: stricter reference limit enforcement.
  h264: increase reference poc list from 16 to 32.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  Add ffvhuff encoding and decoding regression test
  anm: convert to bytestream2 API
  bytestream: add more unchecked variants for bytestream2 API
  jvdec: unbreak video decoding
  jv demux: set video stream duration
  fate: add pam image regression test

Conflicts:
	libavcodec/adpcm.c
	libavcodec/anm.c
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavcodec/snowdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-15 01:27:10 +01:00
..
2011-09-25 12:29:20 +02:00
dv
2011-11-23 04:02:17 +01:00
2011-08-13 19:13:03 +02:00
2011-12-17 03:25:46 +01:00
2011-09-27 21:32:39 +02:00
2011-12-05 20:05:44 +01:00
2012-01-29 21:00:19 +01:00
2011-12-28 20:50:41 +01:00
2012-01-29 18:11:40 +01:00
2011-05-18 14:45:46 +01:00
2012-01-29 02:41:09 +01:00
yuv
2011-12-17 03:25:46 +01:00
2012-01-29 18:11:40 +01:00
2011-12-05 20:05:44 +01:00
2011-12-10 19:34:28 +01:00