aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/seek/mpeg4_rc_avi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-17 14:43:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-17 14:43:26 +0200
commitc079da5073167b5e7e959af12ef157e71bde0015 (patch)
tree65e084a372ae7e9e441a1e7713941a803dc19f1f /tests/ref/seek/mpeg4_rc_avi
parentfadfbb354b30f018338c66712bfe5a6b58970b9a (diff)
parent0bca0283ccded5e32da143a462168ad1988a58fd (diff)
downloadffmpeg-c079da5073167b5e7e959af12ef157e71bde0015.tar.gz
Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'
* commit '0bca0283ccded5e32da143a462168ad1988a58fd': riff: do not write empty INFO tags Conflicts: tests/ref/fate/vsynth1-cljr tests/ref/fate/vsynth1-ffvhuff tests/ref/fate/vsynth1-h261 tests/ref/fate/vsynth1-h263 tests/ref/fate/vsynth1-h263-obmc tests/ref/fate/vsynth1-h263p tests/ref/fate/vsynth1-huffyuv tests/ref/fate/vsynth1-jpegls tests/ref/fate/vsynth1-mjpeg tests/ref/fate/vsynth1-mpeg4-adap tests/ref/fate/vsynth1-mpeg4-adv tests/ref/fate/vsynth1-mpeg4-error tests/ref/fate/vsynth1-mpeg4-nr tests/ref/fate/vsynth1-mpeg4-qpel tests/ref/fate/vsynth1-mpeg4-qprd tests/ref/fate/vsynth1-mpeg4-rc tests/ref/fate/vsynth1-mpeg4-thread tests/ref/fate/vsynth1-msmpeg4 tests/ref/fate/vsynth1-msmpeg4v2 tests/ref/fate/vsynth1-rgb tests/ref/fate/vsynth1-wmv1 tests/ref/fate/vsynth1-wmv2 tests/ref/fate/vsynth1-yuv tests/ref/fate/vsynth2-cljr tests/ref/fate/vsynth2-ffvhuff tests/ref/fate/vsynth2-h261 tests/ref/fate/vsynth2-h263 tests/ref/fate/vsynth2-h263-obmc tests/ref/fate/vsynth2-h263p tests/ref/fate/vsynth2-huffyuv tests/ref/fate/vsynth2-jpegls tests/ref/fate/vsynth2-mjpeg tests/ref/fate/vsynth2-mpeg4-adap tests/ref/fate/vsynth2-mpeg4-error tests/ref/fate/vsynth2-mpeg4-nr tests/ref/fate/vsynth2-mpeg4-qpel tests/ref/fate/vsynth2-mpeg4-qprd tests/ref/fate/vsynth2-mpeg4-rc tests/ref/fate/vsynth2-mpeg4-thread tests/ref/fate/vsynth2-msmpeg4 tests/ref/fate/vsynth2-msmpeg4v2 tests/ref/fate/vsynth2-rgb tests/ref/fate/vsynth2-wmv1 tests/ref/fate/vsynth2-wmv2 tests/ref/fate/vsynth2-yuv tests/ref/lavf/avi tests/ref/seek/h261_avi tests/ref/seek/h263_avi tests/ref/seek/h263p_avi tests/ref/seek/lavf_avi tests/ref/seek/mjpeg_avi tests/ref/seek/mpeg4_adap_avi tests/ref/seek/mpeg4_error_avi tests/ref/seek/mpeg4_nr_avi tests/ref/seek/mpeg4_qpel_avi tests/ref/seek/mpeg4_qprd_avi tests/ref/seek/mpeg4_rc_avi tests/ref/seek/mpeg4_thread_avi tests/ref/seek/msmpeg4_avi tests/ref/seek/msmpeg4v2_avi tests/ref/seek/wmv1_avi tests/ref/seek/wmv2_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek/mpeg4_rc_avi')
-rw-r--r--tests/ref/seek/mpeg4_rc_avi40
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/ref/seek/mpeg4_rc_avi b/tests/ref/seek/mpeg4_rc_avi
index fbefdc0e91..6bcfd48ce1 100644
--- a/tests/ref/seek/mpeg4_rc_avi
+++ b/tests/ref/seek/mpeg4_rc_avi
@@ -1,46 +1,46 @@
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207962 size: 13826
+ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207950 size: 13826
ret: 0 st: 0 flags:0 ts: 0.800000
-ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153796 size: 13377
+ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153784 size: 13377
ret:-1 st: 0 flags:1 ts:-0.320000
ret:-1 st:-1 flags:0 ts: 2.576668
ret: 0 st:-1 flags:1 ts: 1.470835
-ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180958 size: 13326
+ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180946 size: 13326
ret: 0 st: 0 flags:0 ts: 0.360000
-ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94586 size: 32807
+ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94574 size: 32807
ret:-1 st: 0 flags:1 ts:-0.760000
ret:-1 st:-1 flags:0 ts: 2.153336
ret: 0 st:-1 flags:1 ts: 1.047503
-ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153796 size: 13377
+ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153784 size: 13377
ret: 0 st: 0 flags:0 ts:-0.040000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st: 0 flags:1 ts: 2.840000
-ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207962 size: 13826
+ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207950 size: 13826
ret: 0 st:-1 flags:0 ts: 1.730004
-ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207962 size: 13826
+ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207950 size: 13826
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94586 size: 32807
+ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94574 size: 32807
ret: 0 st: 0 flags:0 ts:-0.480000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st: 0 flags:1 ts: 2.400000
-ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207962 size: 13826
+ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207950 size: 13826
ret: 0 st:-1 flags:0 ts: 1.306672
-ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180958 size: 13326
+ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180946 size: 13326
ret: 0 st:-1 flags:1 ts: 0.200839
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st: 0 flags:0 ts:-0.920000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5660 size: 15766
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5648 size: 15766
ret: 0 st: 0 flags:1 ts: 2.000000
-ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207962 size: 13826
+ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207950 size: 13826
ret: 0 st:-1 flags:0 ts: 0.883340
-ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153796 size: 13377
+ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153784 size: 13377
ret:-1 st:-1 flags:1 ts:-0.222493
ret:-1 st: 0 flags:0 ts: 2.680000
ret: 0 st: 0 flags:1 ts: 1.560000
-ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180958 size: 13326
+ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180946 size: 13326
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153796 size: 13377
+ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153784 size: 13377
ret:-1 st:-1 flags:1 ts:-0.645825