Merge commit 'a73b2c288e3dace6e054a5b48640978be1d5df84' into release/2.4

Browse Source

* commit 'a73b2c288e3dace6e054a5b48640978be1d5df84':
  adxdec: set avctx->channels in adx_read_header

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

...

This commit is contained in:

Michael Niedermayer

2015-03-09 01:38:30 +01:00

parent 72f83ad277 a73b2c288e

commit cda143aaa4

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

Diff Content Not Available