Michael Niedermayer 2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' ... * commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-02-23 12:19:26 +01:00
..
aac.mak	Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'	2015-02-07 04:54:39 +01:00
ac3.mak
acodec.mak	fate: add wavpack encoder	2015-02-13 09:22:18 +00:00
adpcm.mak
alac.mak
als.mak
amrnb.mak
amrwb.mak
atrac.mak
audio.mak	Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'	2015-02-19 21:53:39 +01:00
avformat.mak	test/fate: added mxf_opatom regression tests	2015-02-10 11:28:53 +01:00
bmp.mak
cdxl.mak
cover-art.mak
demux.mak
dfa.mak
dpcm.mak
ea.mak
exif.mak
ffmpeg.mak
ffprobe.mak
fft.mak
filter-audio.mak
filter-video.mak	avfilter: add showpalette filter	2015-01-15 16:36:13 +01:00
flac.mak
gif.mak
h264.mak
hevc.mak
image.mak	Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'	2014-12-30 01:44:08 +01:00
indeo.mak
libavcodec.mak
libavdevice.mak
libavformat.mak
libavresample.mak
libavutil.mak	tests: fate: adding fate-test for twofish	2015-02-18 17:57:43 +01:00
libswresample.mak
lossless-audio.mak
lossless-video.mak
microsoft.mak
monkeysaudio.mak
mp3.mak
mpc.mak
mpeg4.mak
mxf.mak	tests/fate: added mxf tests for essencegroups and missing index	2015-01-28 05:45:32 +01:00
opus.mak
pcm.mak
probe.mak
prores.mak
qt.mak	Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148'	2015-02-15 20:25:31 +01:00
qtrle.mak
real.mak
screen.mak
seek.mak	test/fate: added mxf_opatom regression tests	2015-02-10 11:28:53 +01:00
subtitles.mak
utvideo.mak
vcodec.mak	fate: mjpeg trellis test	2015-02-11 22:44:06 +01:00
video.mak	Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'	2015-02-23 12:19:26 +01:00
voice.mak
vorbis.mak
vpx.mak
vqf.mak
wavpack.mak
wma.mak
xvid.mak