libavformat: DNxHD in .mov, switch unspecified color_range to mpeg

[ffmpeg] / libavformat / nsvdec.c

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index f3a26c60491466629df046ba5384fb74df2a2625..632667ca97caef5808f56cca68e49dae70fb4db0 100644 (file)
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -621,6 +621,8 @@ null_chunk_retry:
             bps = avio_r8(pb);
             channels = avio_r8(pb);
             samplerate = avio_rl16(pb);
+            if (!channels || !samplerate)
+                return AVERROR_INVALIDDATA;
             asize-=4;
             av_dlog(s, "NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate);
             if (fill_header) {
@@ -628,10 +630,7 @@ null_chunk_retry:
                 if (bps != 16) {
                     av_dlog(s, "NSV AUDIO bit/sample != 16 (%d)!!!\n", bps);
                 }
-                if(channels)
-                    bps /= channels; // ???
-                else
-                    av_log(s, AV_LOG_WARNING, "Channels is 0\n");
+                bps /= channels; // ???
                 if (bps == 8)
                     st[NSV_ST_AUDIO]->codec->codec_id = AV_CODEC_ID_PCM_U8;
                 samplerate /= 4;/* UGH ??? XXX */