Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'

Browse Source

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

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-04-20 05:28:13 +02:00

parent fcca7671e2 22526c1f55

commit 5a284d076f

17 changed files with 9029 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8376

libavcodec/hq_hqadata.c Normal file

File diff suppressed because it is too large Load Diff