diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-02 05:02:18 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-02 05:24:09 +0400 |
commit | 4c677df27cc62e5dd8df9da9d0ca9fb7d963bc08 (patch) | |
tree | 1453699ac3b21c5c25889aaed590ca4bc0c7a755 /tests | |
parent | 5cd8afee99c83b62e1474f122d947de7e4ad9ff5 (diff) | |
parent | 5ff88020ac4cd285fa00d0c559aa196bbd8526d7 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
frwu: Employ more meaningful return values.
fraps: Use av_fast_padded_malloc() instead of av_realloc()
mjpegdec: use av_fast_padded_malloc()
eatqi: use av_fast_padded_malloc()
asv1: use av_fast_padded_malloc()
avcodec: Add av_fast_padded_malloc().
swscale: enable dithering in MMX functions.
swscale: make rgb24 function macros slightly smaller.
avcodec.h: Remove some disabled cruft.
swscale: remove obsolete comment.
swscale-test: Drop unused argc and argv arguments from main().
zmbv: Employ more meaningful return values.
zmbvenc: Employ more meaningful return values.
vc1: prevent null pointer dereference on broken files
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
truespeech: align buffer
ac3: Do not read past the end of ff_ac3_band_start_tab.
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
dv: Fix null pointer dereference due to ach=0
dv: check stype
...
Conflicts:
doc/APIchanges
libavcodec/asv1.c
libavcodec/avcodec.h
libavcodec/eatqi.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/zmbv.c
libavformat/dv.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/libavcodec.mak | 1 | ||||
-rw-r--r-- | tests/ref/fate/golomb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 90c817812f..ec4012ebb6 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -1,6 +1,7 @@ FATE_TESTS += fate-golomb fate-golomb: libavcodec/golomb-test$(EXESUF) fate-golomb: CMD = run libavcodec/golomb-test +fate-golomb: REF = /dev/null FATE_TESTS += fate-iirfilter fate-iirfilter: libavcodec/iirfilter-test$(EXESUF) diff --git a/tests/ref/fate/golomb b/tests/ref/fate/golomb deleted file mode 100644 index 652e97b305..0000000000 --- a/tests/ref/fate/golomb +++ /dev/null @@ -1,2 +0,0 @@ -testing unsigned exp golomb -testing signed exp golomb |