9b89041a86
* commit 'c02d4c1a98aef485be25228b33adb4ce357173e4': adpcm: Write the correct number of samples for ima-dk4 imc: Catch a division by zero atrac3: Error on impossible encoding/channel combinations atrac3: set the getbits context the right buffer_end atrac3: fix error handling qdm2: check and reset dithering index per channel qdm2: formatting cosmetics qdm2: use init_static_data westwood_vqa: do not free extradata on error in read_header vqavideo: check the version rmdec: Use the AVIOContext given as parameter in rm_read_metadata() avio: Handle AVERROR_EOF in the same way as the return value 0 Conflicts: libavcodec/adpcm.c libavcodec/qdm2.c libavcodec/vqavideo.c libavformat/rmdec.c libavformat/westwood_vqa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.