Michael Niedermayer 526cb36e4b Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' ... * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-11 15:46:48 +02:00
..
aac.mak	mov: remove default of 1024 sample skip for aac.	2012-09-28 20:30:37 +02:00
ac3.mak	Merge remote-tracking branch 'qatar/master'	2012-10-10 14:13:51 +02:00
acodec.mak
adpcm.mak
alac.mak	FATE: add ALAC encoding tests	2012-08-22 16:41:57 -04:00
als.mak
amrnb.mak	fate: Refactor setting of environment variables for groups of tests	2012-10-10 10:49:51 +02:00
amrwb.mak	fate: Refactor setting of environment variables for groups of tests	2012-10-10 10:49:51 +02:00
atrac.mak	fate: Refactor setting of environment variables for groups of tests	2012-10-10 10:49:51 +02:00
audio.mak	Merge remote-tracking branch 'qatar/master'	2012-10-10 14:13:51 +02:00
bmp.mak
cdxl.mak
cover-art.mak
dct.mak
demux.mak
dfa.mak
dpcm.mak
ea.mak
ffprobe.mak	tests: update fate-ffprobe test to make use of -bitexact flag	2012-09-22 09:34:56 +02:00
fft.mak
filter.mak
flac.mak	fate: flac: Only run tests requiring samples when samples are available	2012-08-22 00:58:44 +02:00
h264.mak
image.mak
indeo.mak
libavcodec.mak
libavformat.mak	fate: Add tests of the ff_make_absolute_url function	2012-10-09 14:16:34 +03:00
libavutil.mak	fate: Add parseutils test	2012-10-06 09:24:54 +02:00
lossless-audio.mak	fate-lossless-tak: remove unneeded -f s16le	2012-10-09 08:48:36 +00:00
lossless-video.mak	fate: Fix --disable-zlib	2012-09-29 16:09:05 +02:00
mapchan.mak
microsoft.mak
mp3.mak	fate: mp3: drop redundant CMP setting	2012-09-10 00:07:24 +01:00
mpc.mak	Merge remote-tracking branch 'qatar/master'	2012-09-08 12:53:44 +02:00
options.mak
pcm.mak
probe.mak
prores.mak
qt.mak	fate: Fix --disable-zlib	2012-09-29 16:09:05 +02:00
qtrle.mak
real.mak	Merge remote-tracking branch 'qatar/master'	2012-10-10 14:13:51 +02:00
screen.mak	fate: Fix --disable-zlib	2012-09-29 16:09:05 +02:00
subtitles.mak	WebVTT demuxer and decoder.	2012-09-23 15:24:08 +02:00
utvideo.mak	fate-utvideoenc: remove unneeded -f avi	2012-09-01 01:54:40 +02:00
vcodec.mak	Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'	2012-10-11 15:46:48 +02:00
video.mak	fate: Fix --disable-zlib	2012-09-29 16:09:05 +02:00
voice.mak	Merge remote-tracking branch 'qatar/master'	2012-10-10 14:13:51 +02:00
vorbis.mak
vpx.mak
vqf.mak
wavpack.mak
wma.mak	fate: Refactor setting of environment variables for groups of tests	2012-10-10 10:49:51 +02:00