diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-04-28 13:02:41 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-04-28 20:14:48 +0200 |
| commit | 4b0521eca9647a092388c44186ea07b3d4416cdb (patch) | |
| tree | 3eec1df527c3088dd4f950fcead7326ec334c5e6 /libavcodec/utils.c | |
| parent | 82c71913e46552f9b41ed3f63571b7777a999f68 (diff) | |
| download | ffmpeg-4b0521eca9647a092388c44186ea07b3d4416cdb.tar.gz | |
lavc: add a channel_layout field to AVFrame.
The field is filled with the codec context information.
FIXME need a minor version bump.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bd97431bb2..85c6351380 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1545,6 +1545,8 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, frame->pkt_dts = avpkt->dts; if (frame->format == AV_SAMPLE_FMT_NONE) frame->format = avctx->sample_fmt; + if (!frame->channel_layout) + frame->channel_layout = avctx->channel_layout; } avctx->pkt = NULL; |