mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
c079da5073
* 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>
47 lines
2.7 KiB
Plaintext
47 lines
2.7 KiB
Plaintext
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 12096
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 12096
|
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
|
ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 627814 size: 14806
|
|
ret: 0 st: 0 flags:0 ts: 0.800000
|
|
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 247498 size: 12959
|
|
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.480000 pts: 1.480000 pos: 480736 size: 14519
|
|
ret: 0 st: 0 flags:0 ts: 0.360000
|
|
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 110996 size: 11924
|
|
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: 1.040000 pts: 1.040000 pos: 326680 size: 13491
|
|
ret: 0 st: 0 flags:0 ts:-0.040000
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 12096
|
|
ret: 0 st: 0 flags:1 ts: 2.840000
|
|
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
|
|
ret: 0 st:-1 flags:0 ts: 1.730004
|
|
ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 568606 size: 14751
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 196420 size: 12720
|
|
ret: 0 st: 0 flags:0 ts:-0.480000
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 12096
|
|
ret: 0 st: 0 flags:1 ts: 2.400000
|
|
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
|
|
ret: 0 st:-1 flags:0 ts: 1.306672
|
|
ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 423470 size: 14114
|
|
ret: 0 st:-1 flags:1 ts: 0.200839
|
|
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 63862 size: 11715
|
|
ret: 0 st: 0 flags:0 ts:-0.920000
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 12096
|
|
ret: 0 st: 0 flags:1 ts: 2.000000
|
|
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 657468 size: 14897
|
|
ret: 0 st:-1 flags:0 ts: 0.883340
|
|
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 273512 size: 13122
|
|
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.560000 pts: 1.560000 pos: 509892 size: 14594
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146950 size: 12173
|
|
ret:-1 st:-1 flags:1 ts:-0.645825
|