git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7b8506
)
ws-snd1: set channel layout
author
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 23 Oct 2012 21:22:53 +0000
(17:22 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 1 Nov 2012 15:30:04 +0000
(11:30 -0400)
libavcodec/ws-snd1.c
patch
|
blob
|
history
diff --git
a/libavcodec/ws-snd1.c
b/libavcodec/ws-snd1.c
index
880ae85
..
05cb31c
100644
(file)
--- a/
libavcodec/ws-snd1.c
+++ b/
libavcodec/ws-snd1.c
@@
-20,6
+20,8
@@
*/
#include <stdint.h>
*/
#include <stdint.h>
+
+#include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
@@
-46,12
+48,9
@@
static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
{
WSSndContext *s = avctx->priv_data;
{
WSSndContext *s = avctx->priv_data;
- if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
- return AVERROR(EINVAL);
- }
-
- avctx->sample_fmt = AV_SAMPLE_FMT_U8;
+ avctx->channels = 1;
+ avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ avctx->sample_fmt = AV_SAMPLE_FMT_U8;
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;