summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/flvdec.c4
-rw-r--r--libavformat/nutenc.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2f68653882..54c1b0cf4a 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 7234cd9ee0..8977e7265d 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;