[FFmpeg-cvslog] avformat/nsvdec: remove case which is no longer possible

Paul B Mahol git at videolan.org
Wed Jan 28 19:06:10 CET 2015


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jan 28 09:34:31 2015 +0000| [c099783316cf706c61e97256778fb77635f5e6e8] | committer: Paul B Mahol

avformat/nsvdec: remove case which is no longer possible

Check of channels !=0 is right above.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c099783316cf706c61e97256778fb77635f5e6e8
---

 libavformat/nsvdec.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 531e273..632667c 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -630,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 */



More information about the ffmpeg-cvslog mailing list