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, 33 insertions, 30 deletions

diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
index 652d72307a..ac1d200135 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -10,7 +10,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=572
+pos=669
 flags=K
 [/PACKET]
 [FRAME]
@@ -24,7 +24,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
@@ -43,7 +43,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=2647
+pos=2744
 flags=K
 [/PACKET]
 [FRAME]
@@ -57,7 +57,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
@@ -82,7 +82,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=233068
+pos=233165
 flags=K
 [/PACKET]
 [FRAME]
@@ -96,7 +96,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
@@ -121,7 +121,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=263073
+pos=263170
 flags=K
 [/PACKET]
 [FRAME]
@@ -135,7 +135,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
@@ -154,7 +154,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=265151
+pos=265248
 flags=K
 [/PACKET]
 [FRAME]
@@ -168,7 +168,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
@@ -193,7 +193,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=495575
+pos=495672
 flags=K
 [/PACKET]
 [FRAME]
@@ -207,7 +207,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
@@ -232,7 +232,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525580
+pos=525677
 flags=K
 [/PACKET]
 [FRAME]
@@ -246,7 +246,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
@@ -265,7 +265,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527651
+pos=527748
 flags=K
 [/PACKET]
 [FRAME]
@@ -279,7 +279,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
@@ -298,7 +298,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=529729
+pos=529826
 flags=K
 [/PACKET]
 [FRAME]
@@ -312,7 +312,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
@@ -337,7 +337,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=760153
+pos=760250
 flags=K
 [/PACKET]
 [FRAME]
@@ -351,7 +351,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
@@ -376,7 +376,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790158
+pos=790255
 flags=K
 [/PACKET]
 [FRAME]
@@ -390,7 +390,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
@@ -409,7 +409,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792229
+pos=792326
 flags=K
 [/PACKET]
 [FRAME]
@@ -423,7 +423,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
@@ -442,7 +442,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=794307
+pos=794404
 flags=K
 [/PACKET]
 [FRAME]
@@ -456,7 +456,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
@@ -481,7 +481,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=1024731
+pos=1024828
 flags=K
 [/PACKET]
 [FRAME]
@@ -495,7 +495,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
@@ -545,6 +545,7 @@ DISPOSITION:visual_impaired=0
 DISPOSITION:clean_effects=0
 DISPOSITION:attached_pic=0
 TAG:E=mc²
+TAG:encoder=Lavc55.63.100 pcm_s16le
 [/STREAM]
 [STREAM]
 index=1
@@ -587,6 +588,7 @@ DISPOSITION:clean_effects=0
 DISPOSITION:attached_pic=0
 TAG:title=foobar
 TAG:duration_ts=field-and-tags-conflict-attempt
+TAG:encoder=Lavc55.63.100 rawvideo
 [/STREAM]
 [STREAM]
 index=2
@@ -627,6 +629,7 @@ DISPOSITION:hearing_impaired=0
 DISPOSITION:visual_impaired=0
 DISPOSITION:clean_effects=0
 DISPOSITION:attached_pic=0
+TAG:encoder=Lavc55.63.100 rawvideo
 [/STREAM]
 [FORMAT]
 filename=tests/data/ffprobe-test.nut
@@ -635,8 +638,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
 TAG:title=ffprobe test file
 TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">