Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

Multimedia / FFmpeg - Michael Niedermayer [gmx.at] - 23 February 2015 05:19 UTC

2cf5217 Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

Changelog | 1 +
doc/general.texi | 1 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/avcodec.h | 1 +
libavcodec/codec_desc.c | 7 +
libavcodec/hqx.c | 645 ++++++++++++
libavcodec/hqx.h | 65 ++
libavcodec/hqxvlc.c | 2167 ++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 4 +-
libavformat/riff.c | 1 +
tests/fate/video.mak | 9 +
tests/ref/fate/canopus-hqx422 | 2 +
tests/ref/fate/canopus-hqx422a | 2 +
14 files changed, 2905 insertions(+), 2 deletions(-)

  • Share