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>

1 files changed, 30 insertions, 30 deletions

diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index db5ea8b..cc556a4 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -12,7 +12,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=642
+pos=647
 flags=K
 
 [packets_and_frames.frame.0]
@@ -27,7 +27,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=642
+pkt_pos=647
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -46,7 +46,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=2717
+pos=2722
 flags=K
 
 [packets_and_frames.frame.1]
@@ -61,7 +61,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=2717
+pkt_pos=2722
 pkt_size=230400
 width=320
 height=240
@@ -86,7 +86,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=233138
+pos=233143
 flags=K
 
 [packets_and_frames.frame.2]
@@ -101,7 +101,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=233138
+pkt_pos=233143
 pkt_size=30000
 width=100
 height=100
@@ -126,7 +126,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=263143
+pos=263148
 flags=K
 
 [packets_and_frames.frame.3]
@@ -141,7 +141,7 @@ best_effort_timestamp=1024
 best_effort_timestamp_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=263143
+pkt_pos=263148
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -160,7 +160,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=265221
+pos=265226
 flags=K
 
 [packets_and_frames.frame.4]
@@ -175,7 +175,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=265221
+pkt_pos=265226
 pkt_size=230400
 width=320
 height=240
@@ -200,7 +200,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=495645
+pos=495650
 flags=K
 
 [packets_and_frames.frame.5]
@@ -215,7 +215,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=495645
+pkt_pos=495650
 pkt_size=30000
 width=100
 height=100
@@ -240,7 +240,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525650
+pos=525655
 flags=K
 
 [packets_and_frames.frame.6]
@@ -255,7 +255,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=525650
+pkt_pos=525655
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -274,7 +274,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527721
+pos=527726
 flags=K
 
 [packets_and_frames.frame.7]
@@ -289,7 +289,7 @@ best_effort_timestamp=3072
 best_effort_timestamp_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=527721
+pkt_pos=527726
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -308,7 +308,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=529799
+pos=529804
 flags=K
 
 [packets_and_frames.frame.8]
@@ -323,7 +323,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=529799
+pkt_pos=529804
 pkt_size=230400
 width=320
 height=240
@@ -348,7 +348,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=760223
+pos=760228
 flags=K
 
 [packets_and_frames.frame.9]
@@ -363,7 +363,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=760223
+pkt_pos=760228
 pkt_size=30000
 width=100
 height=100
@@ -388,7 +388,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790228
+pos=790233
 flags=K
 
 [packets_and_frames.frame.10]
@@ -403,7 +403,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=790228
+pkt_pos=790233
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -422,7 +422,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792299
+pos=792304
 flags=K
 
 [packets_and_frames.frame.11]
@@ -437,7 +437,7 @@ best_effort_timestamp=5120
 best_effort_timestamp_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=792299
+pkt_pos=792304
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -456,7 +456,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=794377
+pos=794382
 flags=K
 
 [packets_and_frames.frame.12]
@@ -471,7 +471,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=794377
+pkt_pos=794382
 pkt_size=230400
 width=320
 height=240
@@ -496,7 +496,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=1024801
+pos=1024806
 flags=K
 
 [packets_and_frames.frame.13]
@@ -511,7 +511,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=1024801
+pkt_pos=1024806
 pkt_size=30000
 width=100
 height=100
@@ -688,8 +688,8 @@ nb_programs=0
 format_name=nut
 start_time=0.000000
 duration=0.120000
-size=1054882
-bit_rate=70325466
+size=1054887
+bit_rate=70325800
 probe_score=100
 
 [format.tags]