Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 35 insertions, 30 deletions

diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index 31d397d1e2..0fe3e56370 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=572
+pos=669
 flags=K
 
 [packets_and_frames.frame.0]
@@ -26,7 +26,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=572
+pkt_pos=669
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -45,7 +45,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=2647
+pos=2744
 flags=K
 
 [packets_and_frames.frame.1]
@@ -59,7 +59,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=2647
+pkt_pos=2744
 pkt_size=230400
 width=320
 height=240
@@ -84,7 +84,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=233068
+pos=233165
 flags=K
 
 [packets_and_frames.frame.2]
@@ -98,7 +98,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=233068
+pkt_pos=233165
 pkt_size=30000
 width=100
 height=100
@@ -123,7 +123,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=263073
+pos=263170
 flags=K
 
 [packets_and_frames.frame.3]
@@ -137,7 +137,7 @@ best_effort_timestamp=1024
 best_effort_timestamp_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=263073
+pkt_pos=263170
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -156,7 +156,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=265151
+pos=265248
 flags=K
 
 [packets_and_frames.frame.4]
@@ -170,7 +170,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=265151
+pkt_pos=265248
 pkt_size=230400
 width=320
 height=240
@@ -195,7 +195,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=495575
+pos=495672
 flags=K
 
 [packets_and_frames.frame.5]
@@ -209,7 +209,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=495575
+pkt_pos=495672
 pkt_size=30000
 width=100
 height=100
@@ -234,7 +234,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525580
+pos=525677
 flags=K
 
 [packets_and_frames.frame.6]
@@ -248,7 +248,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=525580
+pkt_pos=525677
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -267,7 +267,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527651
+pos=527748
 flags=K
 
 [packets_and_frames.frame.7]
@@ -281,7 +281,7 @@ best_effort_timestamp=3072
 best_effort_timestamp_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=527651
+pkt_pos=527748
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -300,7 +300,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=529729
+pos=529826
 flags=K
 
 [packets_and_frames.frame.8]
@@ -314,7 +314,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=529729
+pkt_pos=529826
 pkt_size=230400
 width=320
 height=240
@@ -339,7 +339,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=760153
+pos=760250
 flags=K
 
 [packets_and_frames.frame.9]
@@ -353,7 +353,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=760153
+pkt_pos=760250
 pkt_size=30000
 width=100
 height=100
@@ -378,7 +378,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790158
+pos=790255
 flags=K
 
 [packets_and_frames.frame.10]
@@ -392,7 +392,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=790158
+pkt_pos=790255
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -411,7 +411,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792229
+pos=792326
 flags=K
 
 [packets_and_frames.frame.11]
@@ -425,7 +425,7 @@ best_effort_timestamp=5120
 best_effort_timestamp_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=792229
+pkt_pos=792326
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -444,7 +444,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=794307
+pos=794404
 flags=K
 
 [packets_and_frames.frame.12]
@@ -458,7 +458,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=794307
+pkt_pos=794404
 pkt_size=230400
 width=320
 height=240
@@ -483,7 +483,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=1024731
+pos=1024828
 flags=K
 
 [packets_and_frames.frame.13]
@@ -497,7 +497,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=1024731
+pkt_pos=1024828
 pkt_size=30000
 width=100
 height=100
@@ -551,6 +551,7 @@ attached_pic=0
 
 [streams.stream.0.tags]
 E=mc²
+encoder=Lavc55.63.100 pcm_s16le
 
 [streams.stream.1]
 index=1
@@ -597,6 +598,7 @@ attached_pic=0
 [streams.stream.1.tags]
 title=foobar
 duration_ts=field-and-tags-conflict-attempt
+encoder=Lavc55.63.100 rawvideo
 
 [streams.stream.2]
 index=2
@@ -640,6 +642,9 @@ visual_impaired=0
 clean_effects=0
 attached_pic=0
 
+[streams.stream.2.tags]
+encoder=Lavc55.63.100 rawvideo
+
 [format]
 filename=tests/data/ffprobe-test.nut
 nb_streams=3
@@ -647,8 +652,8 @@ nb_programs=0
 format_name=nut
 start_time=0.000000
 duration=0.120000
-size=1054812
-bit_rate=70320800
+size=1054909
+bit_rate=70327266
 probe_score=100
 
 [format.tags]