[FFmpeg-cvslog] flvdec: remove duplicate return

Michael Niedermayer git at videolan.org
Fri Aug 31 15:50:30 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 31 15:27:58 2012 +0200| [d7587ba1c62c9212b522112ac996fdb17f715ba2] | committer: Michael Niedermayer

flvdec: remove duplicate return

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/flvdec.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index bf1ff98..43a3723 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -126,8 +126,6 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
     default:
         return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
     }
-
-    return 0;
 }
 
 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecContext *acodec, int flv_codecid) {
@@ -198,8 +196,6 @@ static int flv_same_video_codec(AVCodecContext *vcodec, int flags)
         default:
             return vcodec->codec_tag == flv_codecid;
     }
-
-    return 0;
 }
 
 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) {



More information about the ffmpeg-cvslog mailing list