1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
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
..
2012-03-07 12:16:36 -08:00
2012-02-20 15:08:41 -05:00
2012-03-13 01:14:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 22:05:22 +01:00
2012-03-07 05:11:40 +01:00
2012-02-24 03:30:42 +01:00
2012-03-02 18:58:19 +02:00
2012-03-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2012-03-03 04:14:37 +01:00
2012-03-13 22:38:45 +01:00
2012-03-13 01:14:04 +01:00
2012-02-24 04:13:01 +01:00
2012-02-14 19:03:10 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-02-16 06:25:32 +01:00
2012-03-10 20:17:11 +01:00
2012-03-10 20:17:11 +01:00
2012-03-09 09:17:07 +01:00
2012-03-08 17:13:58 +01:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-02-25 07:45:06 +01:00
2012-02-23 23:40:51 +01:00
2012-02-04 01:12:04 +01:00