Michael Niedermayer 8334850a99 Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce' ...

* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
	ffmpeg.c

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

2014-05-18 14:38:36 +02:00

..

aiff

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

alaw

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

asf

Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

2014-05-01 17:40:14 +02:00

ast

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

au

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

avi

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

bmp

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

caf

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

dpx

Add unscaled converter from GBRP > 8bit to RGBx48/64.

2013-06-06 23:57:50 +02:00

dv_fmt

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

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

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

ismv

avformat/movenc: only ommit encoder tag of the metadata for bitexact mode

2014-03-16 16:26:35 +01:00

jpg

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

mkv

matroskaenc: write CodecDelay

2014-05-01 08:03:51 +02:00

mmf

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

mov

avformat/movenc: only ommit encoder tag of the metadata for bitexact mode

2014-03-16 16:26:35 +01:00

mpg

mpeg12enc: always set closed gop flag on the first gop

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

mulaw

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

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

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

ogg

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

pam

swscale/utils: Fix color range of gray16

2014-03-18 22:15:15 +01:00

pbmpipe

…

pcx

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

pgm

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02:00

pgmpipe

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02:00

pixfmt

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02:00

png

swscale/utils: Fix color range of gray16

2014-03-18 22:15:15 +01:00

ppm

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

ppmpipe

…

rm

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

rso

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

sgi

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

smjpeg

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

sox

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

sunrast

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

swf

…

tga

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

tiff

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02:00

ts

avformat/mpegtsenc: Changed Video PES packet length to 0.

2014-04-22 16:05:25 +02:00

voc

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

voc_s16

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

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

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02:00

yuv4mpeg

…