[FFmpeg-cvslog] Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

Michael Niedermayer git at videolan.org
Thu Mar 5 20:45:55 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  5 20:32:18 2015 +0100| [777179edb5ad3000e3c74d04db4f9affe1a170b6] | committer: Michael Niedermayer

Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=777179edb5ad3000e3c74d04db4f9affe1a170b6
---





More information about the ffmpeg-cvslog mailing list