FFmpeg/tests/ref/lavf
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
caf ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
dpx
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
flv_fmt
gif
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
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
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
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png
ppm
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
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
swf
tga
tiff
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
xwd
yuv4mpeg