[FFmpeg-cvslog] Remove unreachable returns

Diego Biurrun git at videolan.org
Sun Jul 28 13:34:23 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Feb 14 12:42:57 2013 +0100| [6ff15cd569e1345bc3612fb69ad3003b104fe50d] | committer: Diego Biurrun

Remove unreachable returns

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

 libavformat/flvdec.c |    4 ----
 libavformat/nutenc.c |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2f68653..54c1b0c 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -125,8 +125,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) {
@@ -197,8 +195,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, int read) {
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 7234cd9..8977e72 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -93,7 +93,7 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame,
         header |= (bitrate_index & 1) << 9;
 
         return 2; //FIXME actually put the needed ones in build_elision_headers()
-        return 3; //we guess that the private bit is not set
+        //return 3; //we guess that the private bit is not set
 //FIXME the above assumptions should be checked, if these turn out false too often something should be done
     }
     return 0;



More information about the ffmpeg-cvslog mailing list