Merge commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81'

[ffmpeg] / libavcodec / encode.c

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index 6e9d487306802f513409ee5be7aff19c3b6d8d19..525ee1f5d64b6ceac4ce28d8073ef809f0dc0b8b 100644 (file)
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -88,7 +88,7 @@ static int pad_last_frame(AVCodecContext *s, AVFrame **dst, const AVFrame *src)
 
     frame->format         = src->format;
     frame->channel_layout = src->channel_layout;
-    av_frame_set_channels(frame, av_frame_get_channels(src));
+    frame->channels       = src->channels;
     frame->nb_samples     = s->frame_size;
     ret = av_frame_get_buffer(frame, 32);
     if (ret < 0)