Merge commit '44a0036d10579ed91e48df24859e54b08a582742'

[ffmpeg] / libavfilter / avcodec.c

diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index dcd6bb6cd266242c1765f83cf50dfbfa3483a11f..0c1f02ad8a599c86d3fb4135d6a92d7d15ee3ba7 100644 (file)
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -100,7 +100,7 @@ AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame
         return NULL;
 
     if (layout && av_get_channel_layout_nb_channels(layout) != av_frame_get_channels(frame)) {
-        av_log(0, AV_LOG_ERROR, "Layout indicates a differnt number of channels than actually present\n");
+        av_log(0, AV_LOG_ERROR, "Layout indicates a different number of channels than actually present\n");
         return NULL;
     }