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
..
aiff
alaw
asf	Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'	2014-05-01 17:40:14 +02:00
ast
au
avi
bmp
caf
dpx
dv_fmt
ffm	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
flm
flv_fmt
gif	avformat/utils: add gif to tb_unreliable()	2014-04-28 15:20:38 +02:00
gxf	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
ircam
ismv
jpg
mkv	Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'	2014-05-18 21:31:51 +02:00
mmf
mov
mpg	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
mulaw
mxf	mpeg12enc: always set closed gop flag on the first gop	2014-04-01 20:52:37 +02:00
mxf_d10	mpeg12enc: always write closed gops for intra only outputs	2014-04-01 20:52:09 +02:00
nut	Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'	2014-05-18 21:31:51 +02:00
ogg	Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'	2014-05-18 21:31:51 +02:00
pam	swscale/utils: Fix color range of gray16	2014-03-18 22:15:15 +01:00
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png	swscale/utils: Fix color range of gray16	2014-03-18 22:15:15 +01:00
ppm
ppmpipe
rm
rso
sgi
smjpeg
sox
sunrast
swf
tga
tiff
ts	avformat/mpegtsenc: Changed Video PES packet length to 0.	2014-04-22 16:05:25 +02:00
voc
voc_s16
w64	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
wav	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
wtv	Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'	2014-05-18 14:38:36 +02:00
xbm
xwd
yuv4mpeg