diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-06 01:37:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-06 01:37:27 +0100 |
| commit | b404ab9e74d3bca12d5989c366f5cfd746279067 (patch) | |
| tree | fdbba6fdf7a4694fe7b7ecda6401ea6a2e01f95e /libavcodec/eamad.c | |
| parent | a448a5d1c4620aa58ec138fbffd46d18d42d53e0 (diff) | |
| parent | 52401b82bd2ed30d4c4353cb084bf4ee679d0c22 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Don't av_malloc(0).
avconv: only allocate 1 AVFrame per input stream
avconv: fix memleaks due to not freeing the AVFrame for audio
h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
misc Doxygen markup improvements
doxygen: eliminate Qt-style doxygen syntax
g722: Add a regression test for muxing/demuxing in wav
g722: Change bits per sample to 4
g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
api-example: update to use avcodec_decode_audio4()
avplay: use avcodec_decode_audio4()
avplay: use a separate buffer for playing silence
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
mov: Allow empty stts atom.
doc: document preferred Doxygen syntax and make patcheck detect it
Conflicts:
avconv.c
ffplay.c
libavcodec/mlpdec.c
libavcodec/version.h
libavformat/mov.c
tests/codec-regression.sh
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eamad.c')
| -rw-r--r-- | libavcodec/eamad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index ebad3b336c..1f6282394e 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -22,9 +22,9 @@ /** * @file * Electronic Arts Madcow Video Decoder - * by Peter Ross <pross@xvid.org> + * @author Peter Ross <pross@xvid.org> * - * Technical details here: + * @see technical details at * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_MAD */ |