diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-01 02:08:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-01 02:36:09 +0100 |
| commit | a369a6b85819890b21a87af3ce983ce533b7169b (patch) | |
| tree | 838f9821dc09bd99b59ce4a2d8123d5fd6868b91 /tests | |
| parent | 0a3a69e8d77146b53a1112c715a78e7d293883b1 (diff) | |
| parent | 52afc9716849e6fb6c2420674d790d374061c663 (diff) | |
| download | ffmpeg-a369a6b85819890b21a87af3ce983ce533b7169b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
fate: add golomb-test
golomb-test: K&R formatting cosmetics
h264: Split h264-test off into a separate file - golomb-test.c.
h264-test: cleanup: drop timer invocations, commented out code and other cruft
h264-test: Remove unused DSP and AVCodec contexts and related init calls.
adpcm: Add missing stdint.h #include to fix standalone header compilation.
lavf: add functions for accessing the fourcc<->CodecID mapping tables.
lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
lavc: make avcodec_close() work properly on unopened codecs.
lavc: add avcodec_is_open().
lavf: rename AVInputFormat.value to raw_codec_id.
lavf: remove the pointless value field from flv and iv8
lavc/lavf: remove unnecessary symbols from the symbol version script.
lavc: reorder AVCodec fields.
lavf: reorder AVInput/OutputFormat fields.
mp3dec: Fix a heap-buffer-overflow
adpcmenc: remove some unneeded casts
adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
adpcmenc: fix adpcm_ms extradata allocation
adpcmenc: return proper AVERROR codes instead of -1
...
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/adpcmenc.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/libavcodec.v
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/options.c
libavformat/Makefile
libavformat/avformat.h
libavformat/flvdec.c
libavformat/libavformat.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavcodec.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/golomb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 083f6e8b04..90c817812f 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -1,3 +1,7 @@ +FATE_TESTS += fate-golomb +fate-golomb: libavcodec/golomb-test$(EXESUF) +fate-golomb: CMD = run libavcodec/golomb-test + FATE_TESTS += fate-iirfilter fate-iirfilter: libavcodec/iirfilter-test$(EXESUF) fate-iirfilter: CMD = run libavcodec/iirfilter-test diff --git a/tests/ref/fate/golomb b/tests/ref/fate/golomb new file mode 100644 index 0000000000..652e97b305 --- /dev/null +++ b/tests/ref/fate/golomb @@ -0,0 +1,2 @@ +testing unsigned exp golomb +testing signed exp golomb |