[FFmpeg-cvslog] apc: set channel layout
Justin Ruggles
git at videolan.org
Tue Nov 13 11:00:15 CET 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Apr 7 11:25:52 2012 -0400| [39f0e9b8c6f7d99cbf0a3c1784eb6f20bf88ac3a] | committer: Justin Ruggles
apc: set channel layout
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39f0e9b8c6f7d99cbf0a3c1784eb6f20bf88ac3a
---
libavformat/apc.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libavformat/apc.c b/libavformat/apc.c
index 7ae2423..0b6c583 100644
--- a/libavformat/apc.c
+++ b/libavformat/apc.c
@@ -20,6 +20,8 @@
*/
#include <string.h>
+
+#include "libavutil/channel_layout.h"
#include "avformat.h"
static int apc_probe(AVProbeData *p)
@@ -58,9 +60,13 @@ static int apc_read_header(AVFormatContext *s)
/* initial predictor values for adpcm decoder */
avio_read(pb, st->codec->extradata, 2 * 4);
- st->codec->channels = 1;
- if (avio_rl32(pb))
- st->codec->channels = 2;
+ if (avio_rl32(pb)) {
+ st->codec->channels = 2;
+ st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ st->codec->channels = 1;
+ st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ }
st->codec->bits_per_coded_sample = 4;
st->codec->bit_rate = st->codec->bits_per_coded_sample * st->codec->channels
More information about the ffmpeg-cvslog
mailing list