Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 11:03:29 +0000 (12:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 11:19:26 +0000 (12:19 +0100)
commit2cf521718d9427329b9324b00fb59caddcf42782
tree3802359d7d10019217a6d63c5ada55c6373a8c96
parentc0f02b220182cc7997bd6b5279881b898f52dfbf
parent35c6ce76b107225a19eb33aea38857d2405882af
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>
12 files changed:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/hqx.c
libavcodec/hqx.h
libavcodec/hqxvlc.c
libavcodec/version.h
libavformat/riff.c
tests/fate/video.mak