diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:32:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:36:06 +0100 |
| commit | 777179edb5ad3000e3c74d04db4f9affe1a170b6 (patch) | |
| tree | 74b4ec68da0067513ed17c2ce89fdcd3a764c325 /libavcodec/adpcmenc.c | |
| parent | be07270bcaae0dc2a32f9b11d4a73d6f6a8564e3 (diff) | |
| parent | c73c3c34fe72bb06966450207917ce902146b172 (diff) | |
| download | ffmpeg-777179edb5ad3000e3c74d04db4f9affe1a170b6.tar.gz | |
Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'
* commit 'c73c3c34fe72bb06966450207917ce902146b172':
avformat/adxdec: set avctx->channels in adx_read_header
See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions