Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:28:13 +0000 (05:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:28:13 +0000 (05:28 +0200)
commit5a284d076ffdca705204e3e4100917cd4dbda14c
tree409db710f32304c4192b2cebf4446bb0242b8189
parentfcca7671e29b67812d29af710ff90486944ee428
parent22526c1f557a72b3285d295bd8b30c40eb65d437
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'

* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/hq_hqa.c
libavcodec/hq_hqa.h
libavcodec/hq_hqadata.c
libavcodec/hq_hqadsp.c
libavcodec/hq_hqadsp.h
libavcodec/version.h
libavformat/riff.c
tests/fate/video.mak