diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-23 04:02:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-23 04:02:17 +0100 |
| commit | 0b9a69f244e399565d67100a6862886201a594a4 (patch) | |
| tree | 22d82b11955930051b34da252f95b992095e91fd /tests/ref/vsynth2/mpeg4adv | |
| parent | a8e6d4d403c9174b4f57475b80bb5f80e1c57a1f (diff) | |
| parent | 963f6855356fa527a27b08b55e026f683a12cebc (diff) | |
| download | ffmpeg-0b9a69f244e399565d67100a6862886201a594a4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
aacdec: Fix PS in ADTS.
avconv: Consistently use PIX_FMT_NONE.
dsputil: use cpuflags in x86 emu_edge_core
dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
mov: Remove some redundant and obsolete comments.
Add libavutil/mathematics.h #includes for INFINITY
doxy: structure libavformat groups
doxy: introduce an empty structure in libavcodec
doxy: provide a start page and document libavutil
doxy: cleanup pixfmt.h
regtest: split video encode/decode tests into individual targets
ARM: add explicit .arch and .fpu directives to asm.S
pthread: do not touch has_b_frames
avconv: cleanup the transcoding loop in output_packet().
avconv: split subtitle transcoding out of output_packet().
avconv: split video transcoding out of output_packet().
avconv: split audio transcoding out of output_packet().
avconv: reindent.
avconv: move streamcopy-only code out of decoding loop.
...
Conflicts:
avconv.c
libavcodec/aaccoder.c
libavcodec/pthread.c
libavcodec/version.h
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/mem.h
tests/ref/vsynth1/dv
tests/ref/vsynth1/mpeg2thread
tests/ref/vsynth2/dv
tests/ref/vsynth2/mpeg2thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth2/mpeg4adv')
| -rw-r--r-- | tests/ref/vsynth2/mpeg4adv | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/ref/vsynth2/mpeg4adv b/tests/ref/vsynth2/mpeg4adv index f8568c7828..b47cbf19fe 100644 --- a/tests/ref/vsynth2/mpeg4adv +++ b/tests/ref/vsynth2/mpeg4adv @@ -2,15 +2,3 @@ dee7be19486a76d96c88d18eefba8f86 *./tests/data/vsynth2/mpeg4-adv.avi 141546 ./tests/data/vsynth2/mpeg4-adv.avi 3f3a21e9db85a9c0f7022f557a5374c1 *./tests/data/mpeg4adv.vsynth2.out.yuv stddev: 4.94 PSNR: 34.25 MAXDIFF: 69 bytes: 7603200/ 7603200 -fd5ab0f55dbc959316e32923e86290df *./tests/data/vsynth2/mpeg4-qprd.avi -231458 ./tests/data/vsynth2/mpeg4-qprd.avi -de8a883865e2dff7a51f66da6c48df48 *./tests/data/mpeg4adv.vsynth2.out.yuv -stddev: 3.71 PSNR: 36.72 MAXDIFF: 61 bytes: 7603200/ 7603200 -547e1849dcf910935ff6383ca49e5706 *./tests/data/vsynth2/mpeg4-adap.avi -198510 ./tests/data/vsynth2/mpeg4-adap.avi -4affb83f6adc94f31024b4f9e0168945 *./tests/data/mpeg4adv.vsynth2.out.yuv -stddev: 3.75 PSNR: 36.65 MAXDIFF: 71 bytes: 7603200/ 7603200 -7680d2e7d34399dfdfb8a49cf1e10239 *./tests/data/vsynth2/mpeg4-Q.avi -163688 ./tests/data/vsynth2/mpeg4-Q.avi -26dc7c78955fa678fbf150e236eb5627 *./tests/data/mpeg4adv.vsynth2.out.yuv -stddev: 3.97 PSNR: 36.14 MAXDIFF: 54 bytes: 7603200/ 7603200 |