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

…

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

…

vsynth_lena

…