Browse Source

Remove unreachable returns

tags/n2.1
Diego Biurrun 12 years ago
parent
commit
6ff15cd569
2 changed files with 1 additions and 5 deletions
  1. +0
    -4
      libavformat/flvdec.c
  2. +1
    -1
      libavformat/nutenc.c

+ 0
- 4
libavformat/flvdec.c View File

@@ -125,8 +125,6 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
default: default:
return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); 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) { 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: default:
return vcodec->codec_tag == flv_codecid; return vcodec->codec_tag == flv_codecid;
} }

return 0;
} }


static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid, int read) { static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid, int read) {


+ 1
- 1
libavformat/nutenc.c View File

@@ -93,7 +93,7 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame,
header |= (bitrate_index & 1) << 9; header |= (bitrate_index & 1) << 9;


return 2; //FIXME actually put the needed ones in build_elision_headers() 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 //FIXME the above assumptions should be checked, if these turn out false too often something should be done
} }
return 0; return 0;


Loading…
Cancel
Save