Michael Niedermayer 537a9e5cc2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  vmdaudio: fix decoding of 16-bit audio format.
  lavf: do not set codec_tag for rawvideo
  h264: check for out of bounds reads in ff_h264_decode_extradata().
  flvdec: Check for overflow before allocating arrays
  avconv: use correct output stream index when checking max_frames
  avconv: remove fake coded_frame on streamcopy hack

Conflicts:
	avconv.c
	libavcodec/h264.c
	libavcodec/ppc/asm.S
	libavcodec/vmdav.c
	libavformat/flvdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25 23:30:25 +02:00
2011-09-25 17:57:58 +02:00
2011-06-12 18:01:29 +02:00
2011-09-25 12:29:20 +02:00
2011-09-19 17:39:38 +02:00
2011-09-19 07:04:17 +02:00
2011-04-08 02:50:13 +02:00
2011-09-23 19:18:58 +02:00
2011-09-19 07:04:17 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.
Languages
C 89.7%
Assembly 8.2%
Makefile 1.3%
C++ 0.3%
Objective-C 0.1%
Other 0.1%