1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +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
2012-03-14 23:06:00 +01:00
2012-03-05 16:57:28 +01:00
2012-03-13 01:14:04 +01:00
2011-06-12 18:01:29 +02:00
2012-02-23 19:36:16 +01:00
2012-03-10 00:10:37 +01:00
2011-12-05 20:04:48 +01:00
2012-01-25 22:47:45 +01:00
2012-03-14 08:03:29 +01:00
2012-03-08 17:13:58 +01:00
2011-04-08 02:50:13 +02:00
2012-02-23 19:36:16 +01:00
2012-03-13 01:14:04 +01:00
2012-02-23 19:36:16 +01:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%