diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 02:01:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 02:16:26 +0100 |
| commit | 988f585fcb1cfb40fe4b706c32b31594b536bba0 (patch) | |
| tree | 659b8d9f4daf4ce497b42c83f7adb45725fa4f65 /libavcodec/msmpeg4data.h | |
| parent | 0b3e9d5dc61bb705d93db1e87d78d8d5131905c6 (diff) | |
| parent | 594b54b51e9f3af8aac18184d634b85a836b42b6 (diff) | |
| download | ffmpeg-988f585fcb1cfb40fe4b706c32b31594b536bba0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (44 commits)
replacement Indeo 3 decoder
gsm demuxer: do not allocate packet twice.
flvenc: use first packet delay as global delay.
ac3enc: doxygen update.
imc: return error codes instead of 0 for error conditions.
imc: return meaningful error codes instead of -1
imc: do not set channel layout for stereo
imc: validate channel count
imc: check for ff_fft_init() failure
imc: check output buffer size before decoding
imc: use DSPContext.bswap16_buf() to byte-swap packet data
rtsp: add allowed_media_types option
libgsm: add flush function to reset the decoder state when seeking
libgsm: simplify decoding by using a loop
gsm: log error message when packet is too small
libgsmdec: do not needlessly set *data_size to 0
gsmdec: do not needlessly set *data_size to 0
gsmdec: add flush function to reset the decoder state when seeking
libgsmdec: check output buffer size before decoding
gsmdec: log error message when output buffer is too small.
...
Conflicts:
Changelog
ffplay.c
libavcodec/indeo3.c
libavcodec/mjpeg_parser.c
libavcodec/vp3.c
libavformat/cutils.c
libavformat/id3v2.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.h')
| -rw-r--r-- | libavcodec/msmpeg4data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 623d9570a7..008265a2ca 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -1,5 +1,5 @@ /* - * MSMPEG4 backend for ffmpeg encoder and decoder + * MSMPEG4 backend for encoder and decoder * copyright (c) 2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * |