Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

Browse Source

* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
  dcadec: simplify decoding of VQ high frequencies

Conflicts:
	configure
	libavcodec/dcadec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-02-28 21:41:19 +01:00

parent ffb7d7195b 4cb6964244

commit fb3c33f3cd

7 changed files with 80 additions and 76 deletions

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

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