[FFmpeg-devel] [PATCH]Fix changed channel layout log info

[Carl Eugen Hoyos]

Hi!

It seems to me that the line that is shown when the channel 
layout changes uses an incorrect new layout.
The current output can be (line breaks for readability):

Input stream #0:1 frame changed from 
rate:48000 fmt:fltp ch:8 chl:7.1 to 
rate:48000 fmt:fltp ch:8 chl:7.1

if the channel layout changes to "8 channels).

Please review, Carl Eugen
-------------- next part --------------
diff --git a/ffmpeg.c b/ffmpeg.c
index 0f67b11..4e6e471 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1870,13 +1870,13 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
                    ist->st->index);
             exit_program(1);
         }
-        decoded_frame->channel_layout = avctx->channel_layout;
-
         av_get_channel_layout_string(layout1, sizeof(layout1), ist->resample_channels,
                                      ist->resample_channel_layout);
         av_get_channel_layout_string(layout2, sizeof(layout2), avctx->channels,
                                      decoded_frame->channel_layout);
 
+        decoded_frame->channel_layout = avctx->channel_layout;
+
         av_log(NULL, AV_LOG_INFO,
                "Input stream #%d:%d frame changed from rate:%d fmt:%s ch:%d chl:%s to rate:%d fmt:%s ch:%d chl:%s\n",
                ist->file_index, ist->st->index,