diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 18:29:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 18:29:23 +0200 |
| commit | 5c6f7ed667d6109505c19e15078777d8d764df40 (patch) | |
| tree | a5107faf605bcb6a3967a5dfaffc78668743e09e /libavcodec | |
| parent | db2d3a90825025b2f5da85792e1df33280c61391 (diff) | |
| parent | 464f94b206b041fa383ab4257226cb3f18dfb550 (diff) | |
| download | ffmpeg-5c6f7ed667d6109505c19e15078777d8d764df40.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: do not init frame with guessed layout.
lavfi/af_atempo: simplify request_frame loop.
lavfi/af_asetnsamples: simplify request_frame loop.
lavfi/f_ebur128: remove request_frame hack.
lavfi/vf_tile: simplify request_frame loop.
lavfi: reindent after last commit.
lavfi: loop on request_frame if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a341a7dfb4..064b473c86 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -651,8 +651,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) avctx->channels); return AVERROR(ENOSYS); } - - frame->channel_layout = av_get_default_channel_layout(avctx->channels); } } av_frame_set_channels(frame, avctx->channels); |