diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
| commit | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (patch) | |
| tree | b77ee45f34455cf9aa6e28105a7533ecc204b898 /tests | |
| parent | 93c28a55fd84280d97c3c0dd7b0d546043242c34 (diff) | |
| parent | 79ee8977c25eee2408ef7b2822f377a983e4d65b (diff) | |
| download | ffmpeg-d7e5aebae7652ac766034f1d90e5a4f62677fb3c.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...
Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.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 | ||||
| -rw-r--r-- | tests/ref/seek/ac3_rm | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/ref/acodec/ac3_fixed b/tests/ref/acodec/ac3_fixed index a3032d0380..ca8a082c75 100644 --- a/tests/ref/acodec/ac3_fixed +++ b/tests/ref/acodec/ac3_fixed @@ -1,2 +1,2 @@ -5ddb6d25dd117db29627f9d286153a7a *./tests/data/acodec/ac3.rm +0f14801e166819dd4a58981aea36e08b *./tests/data/acodec/ac3.rm 98751 ./tests/data/acodec/ac3.rm diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index a85c7630b4..eae422ae4d 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -a1c71456f21d5459d2824d75bbdcc80c *./tests/data/lavf/lavf.rm +2e3d6b1944c6cd2cf14e13055aecf82a *./tests/data/lavf/lavf.rm 346706 ./tests/data/lavf/lavf.rm diff --git a/tests/ref/seek/ac3_rm b/tests/ref/seek/ac3_rm index 4705447293..05772fcf98 100644 --- a/tests/ref/seek/ac3_rm +++ b/tests/ref/seek/ac3_rm @@ -11,7 +11,8 @@ ret:-1 st:-1 flags:1 ts: 1.470835 ret:-1 st: 0 flags:0 ts: 0.365000 ret: 0 st: 0 flags:1 ts:-0.741000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556 -ret:-1 st:-1 flags:0 ts: 2.153336 +ret: 0 st:-1 flags:0 ts: 2.153336 +ret: 0 st: 0 flags:1 dts: 2.159000 pts: 2.159000 pos: 35567 size: 556 ret:-1 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:0 ts:-0.058000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556 |