diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
| commit | 2cae9809e2d59c7336fc2cccb97b82c7f764868a (patch) | |
| tree | 823d962b7237e515e14e2679084e5981d5b808a5 /tests | |
| parent | 3c9bfb336867ccd32a6e8490930961bcc14b3fdc (diff) | |
| parent | 906fd03070c7dc39b4c937befa2c3559bccf7ba7 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/acodec/ac3_fixed | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/rm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/acodec/ac3_fixed b/tests/ref/acodec/ac3_fixed index d4ade32ddd..ce1a8ec29e 100644 --- a/tests/ref/acodec/ac3_fixed +++ b/tests/ref/acodec/ac3_fixed @@ -1,2 +1,2 @@ -346073c97eada69330f61e103a170ca1 *./tests/data/acodec/ac3.rm +408f47ee5a60866fc751f7bc2314cbd6 *./tests/data/acodec/ac3.rm 98751 ./tests/data/acodec/ac3.rm diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index bb0b1db6ed..fbf3e0fbde 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -7b7ede9548a09346675edad36acfbf19 *./tests/data/lavf/lavf.rm +da74fe749c2eb21bbead7de81d2f3078 *./tests/data/lavf/lavf.rm 346706 ./tests/data/lavf/lavf.rm |