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

..

acodec

fate: add wavpack encoder

2015-02-13 09:22:18 +00:00

fate

Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

2015-02-23 12:19:26 +01:00

lavf

test/fate: added mxf_opatom regression tests

2015-02-10 11:28:53 +01:00

lavf-fate

Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

2014-10-24 15:30:12 +02:00

seek

test/fate: added mxf_opatom regression tests

2015-02-10 11:28:53 +01:00

vsynth

avformat/movenc: Move avid DNxHD padding to the correct spot

2015-02-20 12:17:14 +01:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth_lena

tests: Rename vsynth2 to vsynth_lena

2014-12-02 03:02:30 +01:00