Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

[ffmpeg] / libavcodec / libopusdec.c

diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 1e97604181f174999901e8ce6e6bbe7f26587b6a..acc62f14d86fc9d369dc81c9a266fc67aa0d73c4 100644 (file)
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -22,9 +22,9 @@
 #include <opus.h>
 #include <opus_multistream.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
 #include "internal.h"
 #include "vorbis.h"
@@ -79,7 +79,7 @@ static av_cold int libopus_decode_init(AVCodecContext *avc)
         const uint8_t *vorbis_offset = ff_vorbis_channel_layout_offsets[avc->channels - 1];
         int ch;
 
-        /* Remap channels from vorbis order to ffmpeg order */
+        /* Remap channels from Vorbis order to ffmpeg order */
         for (ch = 0; ch < avc->channels; ch++)
             mapping_arr[ch] = mapping[vorbis_offset[ch]];
         mapping = mapping_arr;