Michael Niedermayer 800ea20cad Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  movenc: Make tkhd "enabled" flag QuickTime compatible

Conflicts:
	libavformat/movenc.c
	tests/ref/acodec/alac
	tests/ref/acodec/pcm-s16be
	tests/ref/acodec/pcm-s24be
	tests/ref/acodec/pcm-s32be
	tests/ref/acodec/pcm-s8
	tests/ref/lavf/mov
	tests/ref/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth1-prores
	tests/ref/vsynth/vsynth1-qtrle
	tests/ref/vsynth/vsynth1-svq1
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-svq1

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

2013-08-23 13:49:24 +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

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +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

ffmpeg: remove obsolete workaround in trim insertion.

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

flm

fate: add filmstrip test

2012-11-03 22:47:14 +01:00

flv_fmt

mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd

2012-09-27 19:43:31 +02:00

gif

lavf/gif: correct the delay after the first frame.

2013-04-19 12:02:19 +02:00

gxf

ffmpeg: remove obsolete workaround in trim insertion.

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

ircam

ffmpeg: remove obsolete workaround in trim insertion.

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

ismv

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

jpg

avconv: make -t insert trim/atrim filters.

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

mkv

ffmpeg: remove obsolete workaround in trim insertion.

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

mmf

ffmpeg: remove obsolete workaround in trim insertion.

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

mov

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

mpg

ffmpeg: remove obsolete workaround in trim insertion.

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

mulaw

ffmpeg: remove obsolete workaround in trim insertion.

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

mxf

ffmpeg: remove obsolete workaround in trim insertion.

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

mxf_d10

mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd

2012-09-27 19:43:31 +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: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +02: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

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +02: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

mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd

2012-09-27 19:43:31 +02:00

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

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +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

ffmpeg: remove obsolete workaround in trim insertion.

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

wav

ffmpeg: remove obsolete workaround in trim insertion.

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

wtv

ffmpeg: remove obsolete workaround in trim insertion.

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

xbm

Add gif and xbm regression tests.

2012-04-09 17:21:35 +02:00

xwd

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

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

yuv4mpeg

…