Michael Niedermayer 1e49439f04 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>

2014-05-18 21:31:51 +02:00

..

acodec

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

fate

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

lavf

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

lavf-fate

lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

2013-12-06 19:33:41 +01:00

seek

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

vsynth

mpeg12enc: always set closed gop flag on the first gop

2014-04-01 20:52:37 +02:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00