Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:19:19 +0000 (05:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:19:46 +0000 (05:19 +0200)
commitfcca7671e29b67812d29af710ff90486944ee428
tree8b67f16bdcbb9f1d2de5c35a527271c36ad2a25f
parentf1db984288f21a1ecdff0b5702630456c089ce36
parente6fb844f7b736e72da364032d251283bce9e63ad
Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'

* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
  Implement shared parsing of INFO tag in Canopus family

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/canopus.c
libavcodec/canopus.h
libavcodec/cllc.c
libavcodec/hqx.c