diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 00:40:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 01:05:33 +0100 |
| commit | 964912aba56a29acf25c9e216255ea44190f419a (patch) | |
| tree | fa82f5555f1604d36380b186f1f89403d0b9c388 /tests/codec-regression.sh | |
| parent | cdba9b617f1a77f035416096f3ea91158ec5307b (diff) | |
| parent | 2e87b4c51152e0241cae7f655d53920029a0e632 (diff) | |
| download | ffmpeg-964912aba56a29acf25c9e216255ea44190f419a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
Warn about avserver being broken.
avconv: drop code for special handling of avserver streams.
rawdec: don't set codec timebase.
lavf doxy: add muxing stuff to lavf_encoding group
lavf doxy: add demuxing stuff to lavf_decoding group
lavf doxy: expand/reword metadata API doxy.
lavf doxy: add installed headers to groups.
lavf doxy: add avio groups into the lavf_io group.
lavf doxy: rename lavf I/O group to lavf_io.
lavf doxy: add metadata docs to the main lavf group
ttadec: check channel count as read from extradata.
Add CLJR encoding and decoding regression tests
cljr: remove unused code
flacdec: Support for tracks in cuesheet metadata block
ptx: fix inverted check for sufficient data
flac muxer: fix writing of file header and STREAMINFO header from extradata
ptx: emit a warning on insufficient picture data
utvideo: add fate tests covering all codec variants
doc: update to refer to avconv
doc: remove some stale entries from the faq
...
Conflicts:
Changelog
avconv.c
doc/avconv.texi
doc/faq.texi
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/avcodec.h
libavcodec/cljr.c
libavformat/avformat.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index f5c57ecccf..7676074d1f 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -19,6 +19,11 @@ if [ -n "$do_aref" ]; then do_avconv $pcm_ref -b 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav fi +if [ -n "$do_cljr" ] ; then +do_video_encoding cljr.avi "-an -vcodec cljr" +do_video_decoding +fi + if [ -n "$do_mpeg" ] ; then # mpeg1 do_video_encoding mpeg1.mpg "-qscale 10 -f mpeg1video" |