diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 14:58:51 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 15:29:43 +0000 |
commit | 14a69ae60c64a071eb65a8521bf3c339322f5903 (patch) | |
tree | 0fa0cc7b8958cecadff8fb6561b8fc4b2613115f /tests/ref/fate/ffprobe_flat | |
parent | 8c5092912b19e793412b07e070da2f8636c2c2f3 (diff) | |
parent | dc6527ed908e4d330738f139074455ffbe56a2de (diff) | |
download | ffmpeg-streaming-14a69ae60c64a071eb65a8521bf3c339322f5903.zip ffmpeg-streaming-14a69ae60c64a071eb65a8521bf3c339322f5903.tar.gz |
Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'
FATE tests have been updated to patch. They do not differ in
any meaningful way.
* commit 'dc6527ed908e4d330738f139074455ffbe56a2de':
nutenc: do not use AVCodecContext.frame_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/ref/fate/ffprobe_flat')
-rw-r--r-- | tests/ref/fate/ffprobe_flat | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index 5a8cb77..e348323 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -9,7 +9,7 @@ packets_and_frames.packet.0.duration_time="0.023220" packets_and_frames.packet.0.convergence_duration="N/A" packets_and_frames.packet.0.convergence_duration_time="N/A" packets_and_frames.packet.0.size="2048" -packets_and_frames.packet.0.pos="642" +packets_and_frames.packet.0.pos="647" packets_and_frames.packet.0.flags="K" packets_and_frames.frame.0.media_type="audio" packets_and_frames.frame.0.stream_index=0 @@ -22,7 +22,7 @@ packets_and_frames.frame.0.best_effort_timestamp=0 packets_and_frames.frame.0.best_effort_timestamp_time="0.000000" packets_and_frames.frame.0.pkt_duration=1024 packets_and_frames.frame.0.pkt_duration_time="0.023220" -packets_and_frames.frame.0.pkt_pos="642" +packets_and_frames.frame.0.pkt_pos="647" packets_and_frames.frame.0.pkt_size="2048" packets_and_frames.frame.0.sample_fmt="s16" packets_and_frames.frame.0.nb_samples=1024 @@ -39,7 +39,7 @@ packets_and_frames.packet.1.duration_time="0.040000" packets_and_frames.packet.1.convergence_duration="N/A" packets_and_frames.packet.1.convergence_duration_time="N/A" packets_and_frames.packet.1.size="230400" -packets_and_frames.packet.1.pos="2717" +packets_and_frames.packet.1.pos="2722" packets_and_frames.packet.1.flags="K" packets_and_frames.frame.1.media_type="video" packets_and_frames.frame.1.stream_index=1 @@ -52,7 +52,7 @@ packets_and_frames.frame.1.best_effort_timestamp=0 packets_and_frames.frame.1.best_effort_timestamp_time="0.000000" packets_and_frames.frame.1.pkt_duration=2048 packets_and_frames.frame.1.pkt_duration_time="0.040000" -packets_and_frames.frame.1.pkt_pos="2717" +packets_and_frames.frame.1.pkt_pos="2722" packets_and_frames.frame.1.pkt_size="230400" packets_and_frames.frame.1.width=320 packets_and_frames.frame.1.height=240 @@ -75,7 +75,7 @@ packets_and_frames.packet.2.duration_time="0.040000" packets_and_frames.packet.2.convergence_duration="N/A" packets_and_frames.packet.2.convergence_duration_time="N/A" packets_and_frames.packet.2.size="30000" -packets_and_frames.packet.2.pos="233138" +packets_and_frames.packet.2.pos="233143" packets_and_frames.packet.2.flags="K" packets_and_frames.frame.2.media_type="video" packets_and_frames.frame.2.stream_index=2 @@ -88,7 +88,7 @@ packets_and_frames.frame.2.best_effort_timestamp=0 packets_and_frames.frame.2.best_effort_timestamp_time="0.000000" packets_and_frames.frame.2.pkt_duration=2048 packets_and_frames.frame.2.pkt_duration_time="0.040000" -packets_and_frames.frame.2.pkt_pos="233138" +packets_and_frames.frame.2.pkt_pos="233143" packets_and_frames.frame.2.pkt_size="30000" packets_and_frames.frame.2.width=100 packets_and_frames.frame.2.height=100 @@ -111,7 +111,7 @@ packets_and_frames.packet.3.duration_time="0.023220" packets_and_frames.packet.3.convergence_duration="N/A" packets_and_frames.packet.3.convergence_duration_time="N/A" packets_and_frames.packet.3.size="2048" -packets_and_frames.packet.3.pos="263143" +packets_and_frames.packet.3.pos="263148" packets_and_frames.packet.3.flags="K" packets_and_frames.frame.3.media_type="audio" packets_and_frames.frame.3.stream_index=0 @@ -124,7 +124,7 @@ packets_and_frames.frame.3.best_effort_timestamp=1024 packets_and_frames.frame.3.best_effort_timestamp_time="0.023220" packets_and_frames.frame.3.pkt_duration=1024 packets_and_frames.frame.3.pkt_duration_time="0.023220" -packets_and_frames.frame.3.pkt_pos="263143" +packets_and_frames.frame.3.pkt_pos="263148" packets_and_frames.frame.3.pkt_size="2048" packets_and_frames.frame.3.sample_fmt="s16" packets_and_frames.frame.3.nb_samples=1024 @@ -141,7 +141,7 @@ packets_and_frames.packet.4.duration_time="0.040000" packets_and_frames.packet.4.convergence_duration="N/A" packets_and_frames.packet.4.convergence_duration_time="N/A" packets_and_frames.packet.4.size="230400" -packets_and_frames.packet.4.pos="265221" +packets_and_frames.packet.4.pos="265226" packets_and_frames.packet.4.flags="K" packets_and_frames.frame.4.media_type="video" packets_and_frames.frame.4.stream_index=1 @@ -154,7 +154,7 @@ packets_and_frames.frame.4.best_effort_timestamp=2048 packets_and_frames.frame.4.best_effort_timestamp_time="0.040000" packets_and_frames.frame.4.pkt_duration=2048 packets_and_frames.frame.4.pkt_duration_time="0.040000" -packets_and_frames.frame.4.pkt_pos="265221" +packets_and_frames.frame.4.pkt_pos="265226" packets_and_frames.frame.4.pkt_size="230400" packets_and_frames.frame.4.width=320 packets_and_frames.frame.4.height=240 @@ -177,7 +177,7 @@ packets_and_frames.packet.5.duration_time="0.040000" packets_and_frames.packet.5.convergence_duration="N/A" packets_and_frames.packet.5.convergence_duration_time="N/A" packets_and_frames.packet.5.size="30000" -packets_and_frames.packet.5.pos="495645" +packets_and_frames.packet.5.pos="495650" packets_and_frames.packet.5.flags="K" packets_and_frames.frame.5.media_type="video" packets_and_frames.frame.5.stream_index=2 @@ -190,7 +190,7 @@ packets_and_frames.frame.5.best_effort_timestamp=2048 packets_and_frames.frame.5.best_effort_timestamp_time="0.040000" packets_and_frames.frame.5.pkt_duration=2048 packets_and_frames.frame.5.pkt_duration_time="0.040000" -packets_and_frames.frame.5.pkt_pos="495645" +packets_and_frames.frame.5.pkt_pos="495650" packets_and_frames.frame.5.pkt_size="30000" packets_and_frames.frame.5.width=100 packets_and_frames.frame.5.height=100 @@ -213,7 +213,7 @@ packets_and_frames.packet.6.duration_time="0.023220" packets_and_frames.packet.6.convergence_duration="N/A" packets_and_frames.packet.6.convergence_duration_time="N/A" packets_and_frames.packet.6.size="2048" -packets_and_frames.packet.6.pos="525650" +packets_and_frames.packet.6.pos="525655" packets_and_frames.packet.6.flags="K" packets_and_frames.frame.6.media_type="audio" packets_and_frames.frame.6.stream_index=0 @@ -226,7 +226,7 @@ packets_and_frames.frame.6.best_effort_timestamp=2048 packets_and_frames.frame.6.best_effort_timestamp_time="0.046440" packets_and_frames.frame.6.pkt_duration=1024 packets_and_frames.frame.6.pkt_duration_time="0.023220" -packets_and_frames.frame.6.pkt_pos="525650" +packets_and_frames.frame.6.pkt_pos="525655" packets_and_frames.frame.6.pkt_size="2048" packets_and_frames.frame.6.sample_fmt="s16" packets_and_frames.frame.6.nb_samples=1024 @@ -243,7 +243,7 @@ packets_and_frames.packet.7.duration_time="0.023220" packets_and_frames.packet.7.convergence_duration="N/A" packets_and_frames.packet.7.convergence_duration_time="N/A" packets_and_frames.packet.7.size="2048" -packets_and_frames.packet.7.pos="527721" +packets_and_frames.packet.7.pos="527726" packets_and_frames.packet.7.flags="K" packets_and_frames.frame.7.media_type="audio" packets_and_frames.frame.7.stream_index=0 @@ -256,7 +256,7 @@ packets_and_frames.frame.7.best_effort_timestamp=3072 packets_and_frames.frame.7.best_effort_timestamp_time="0.069660" packets_and_frames.frame.7.pkt_duration=1024 packets_and_frames.frame.7.pkt_duration_time="0.023220" -packets_and_frames.frame.7.pkt_pos="527721" +packets_and_frames.frame.7.pkt_pos="527726" packets_and_frames.frame.7.pkt_size="2048" packets_and_frames.frame.7.sample_fmt="s16" packets_and_frames.frame.7.nb_samples=1024 @@ -273,7 +273,7 @@ packets_and_frames.packet.8.duration_time="0.040000" packets_and_frames.packet.8.convergence_duration="N/A" packets_and_frames.packet.8.convergence_duration_time="N/A" packets_and_frames.packet.8.size="230400" -packets_and_frames.packet.8.pos="529799" +packets_and_frames.packet.8.pos="529804" packets_and_frames.packet.8.flags="K" packets_and_frames.frame.8.media_type="video" packets_and_frames.frame.8.stream_index=1 @@ -286,7 +286,7 @@ packets_and_frames.frame.8.best_effort_timestamp=4096 packets_and_frames.frame.8.best_effort_timestamp_time="0.080000" packets_and_frames.frame.8.pkt_duration=2048 packets_and_frames.frame.8.pkt_duration_time="0.040000" -packets_and_frames.frame.8.pkt_pos="529799" +packets_and_frames.frame.8.pkt_pos="529804" packets_and_frames.frame.8.pkt_size="230400" packets_and_frames.frame.8.width=320 packets_and_frames.frame.8.height=240 @@ -309,7 +309,7 @@ packets_and_frames.packet.9.duration_time="0.040000" packets_and_frames.packet.9.convergence_duration="N/A" packets_and_frames.packet.9.convergence_duration_time="N/A" packets_and_frames.packet.9.size="30000" -packets_and_frames.packet.9.pos="760223" +packets_and_frames.packet.9.pos="760228" packets_and_frames.packet.9.flags="K" packets_and_frames.frame.9.media_type="video" packets_and_frames.frame.9.stream_index=2 @@ -322,7 +322,7 @@ packets_and_frames.frame.9.best_effort_timestamp=4096 packets_and_frames.frame.9.best_effort_timestamp_time="0.080000" packets_and_frames.frame.9.pkt_duration=2048 packets_and_frames.frame.9.pkt_duration_time="0.040000" -packets_and_frames.frame.9.pkt_pos="760223" +packets_and_frames.frame.9.pkt_pos="760228" packets_and_frames.frame.9.pkt_size="30000" packets_and_frames.frame.9.width=100 packets_and_frames.frame.9.height=100 @@ -345,7 +345,7 @@ packets_and_frames.packet.10.duration_time="0.023220" packets_and_frames.packet.10.convergence_duration="N/A" packets_and_frames.packet.10.convergence_duration_time="N/A" packets_and_frames.packet.10.size="2048" -packets_and_frames.packet.10.pos="790228" +packets_and_frames.packet.10.pos="790233" packets_and_frames.packet.10.flags="K" packets_and_frames.frame.10.media_type="audio" packets_and_frames.frame.10.stream_index=0 @@ -358,7 +358,7 @@ packets_and_frames.frame.10.best_effort_timestamp=4096 packets_and_frames.frame.10.best_effort_timestamp_time="0.092880" packets_and_frames.frame.10.pkt_duration=1024 packets_and_frames.frame.10.pkt_duration_time="0.023220" -packets_and_frames.frame.10.pkt_pos="790228" +packets_and_frames.frame.10.pkt_pos="790233" packets_and_frames.frame.10.pkt_size="2048" packets_and_frames.frame.10.sample_fmt="s16" packets_and_frames.frame.10.nb_samples=1024 @@ -375,7 +375,7 @@ packets_and_frames.packet.11.duration_time="0.023220" packets_and_frames.packet.11.convergence_duration="N/A" packets_and_frames.packet.11.convergence_duration_time="N/A" packets_and_frames.packet.11.size="2048" -packets_and_frames.packet.11.pos="792299" +packets_and_frames.packet.11.pos="792304" packets_and_frames.packet.11.flags="K" packets_and_frames.frame.11.media_type="audio" packets_and_frames.frame.11.stream_index=0 @@ -388,7 +388,7 @@ packets_and_frames.frame.11.best_effort_timestamp=5120 packets_and_frames.frame.11.best_effort_timestamp_time="0.116100" packets_and_frames.frame.11.pkt_duration=1024 packets_and_frames.frame.11.pkt_duration_time="0.023220" -packets_and_frames.frame.11.pkt_pos="792299" +packets_and_frames.frame.11.pkt_pos="792304" packets_and_frames.frame.11.pkt_size="2048" packets_and_frames.frame.11.sample_fmt="s16" packets_and_frames.frame.11.nb_samples=1024 @@ -405,7 +405,7 @@ packets_and_frames.packet.12.duration_time="0.040000" packets_and_frames.packet.12.convergence_duration="N/A" packets_and_frames.packet.12.convergence_duration_time="N/A" packets_and_frames.packet.12.size="230400" -packets_and_frames.packet.12.pos="794377" +packets_and_frames.packet.12.pos="794382" packets_and_frames.packet.12.flags="K" packets_and_frames.frame.12.media_type="video" packets_and_frames.frame.12.stream_index=1 @@ -418,7 +418,7 @@ packets_and_frames.frame.12.best_effort_timestamp=6144 packets_and_frames.frame.12.best_effort_timestamp_time="0.120000" packets_and_frames.frame.12.pkt_duration=2048 packets_and_frames.frame.12.pkt_duration_time="0.040000" -packets_and_frames.frame.12.pkt_pos="794377" +packets_and_frames.frame.12.pkt_pos="794382" packets_and_frames.frame.12.pkt_size="230400" packets_and_frames.frame.12.width=320 packets_and_frames.frame.12.height=240 @@ -441,7 +441,7 @@ packets_and_frames.packet.13.duration_time="0.040000" packets_and_frames.packet.13.convergence_duration="N/A" packets_and_frames.packet.13.convergence_duration_time="N/A" packets_and_frames.packet.13.size="30000" -packets_and_frames.packet.13.pos="1024801" +packets_and_frames.packet.13.pos="1024806" packets_and_frames.packet.13.flags="K" packets_and_frames.frame.13.media_type="video" packets_and_frames.frame.13.stream_index=2 @@ -454,7 +454,7 @@ packets_and_frames.frame.13.best_effort_timestamp=6144 packets_and_frames.frame.13.best_effort_timestamp_time="0.120000" packets_and_frames.frame.13.pkt_duration=2048 packets_and_frames.frame.13.pkt_duration_time="0.040000" -packets_and_frames.frame.13.pkt_pos="1024801" +packets_and_frames.frame.13.pkt_pos="1024806" packets_and_frames.frame.13.pkt_size="30000" packets_and_frames.frame.13.width=100 packets_and_frames.frame.13.height=100 @@ -611,8 +611,8 @@ format.nb_programs=0 format.format_name="nut" format.start_time="0.000000" format.duration="0.120000" -format.size="1054882" -format.bit_rate="70325466" +format.size="1054887" +format.bit_rate="70325800" format.probe_score=100 format.tags.title="ffprobe test file" format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">" |