aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-07-03 02:37:03 +0100
committerMans Rullgard <mans@mansr.com>2011-07-03 03:15:53 +0100
commitb27565b1432f8bb2c933afa184ace6582ad650ee (patch)
treed19025a322659176b11102caf537e81cec1398b7
parent050f2b3e7f3a98bc824cfcaf4c825ed4c643e21c (diff)
downloadffmpeg-b27565b1432f8bb2c933afa184ace6582ad650ee.tar.gz
Remove statements immediately following unconditional jumps
This removes a number of compiler warnings. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/cook.c1
-rw-r--r--libavcodec/flicvideo.c1
-rw-r--r--libavcodec/mjpegdec.c1
-rw-r--r--libavcodec/pcm.c1
-rw-r--r--libavcodec/shorten.c3
-rw-r--r--libavformat/a64.c1
-rw-r--r--libavformat/idroqdec.c1
-rw-r--r--libavformat/oma.c1
-rw-r--r--libavformat/psxstr.c1
-rw-r--r--libavformat/wc3movie.c1
10 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 84211a6d08..8d1078145e 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1156,7 +1156,6 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
default:
av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
return -1;
- break;
}
if(s > 1 && q->subpacket[s].samples_per_channel != q->samples_per_channel) {
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index ed9972c018..e8c0e14386 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -112,7 +112,6 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
case 24 : avctx->pix_fmt = PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */
av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n");
return -1;
- break;
default :
av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth);
return -1;
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 3946df6472..4684190e08 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1540,7 +1540,6 @@ eoi_parser:
}
goto the_end;
- break;
case SOS:
if (!s->got_picture) {
av_log(avctx, AV_LOG_WARNING, "Can not process SOS before SOF, skipping\n");
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 9100646179..2ad395dd0e 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -440,7 +440,6 @@ static int pcm_decode_frame(AVCodecContext *avctx,
default:
av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n");
return -1;
- break;
}
samples = (short *) dst_int32_t;
break;
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index a6e00750e9..e4dfa7c59f 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -471,7 +471,6 @@ static int shorten_decode_frame(AVCodecContext *avctx,
s->cur_chan = 0;
goto frame_done;
}
- break;
}
break;
case FN_VERBATIM:
@@ -489,11 +488,9 @@ static int shorten_decode_frame(AVCodecContext *avctx,
case FN_QUIT:
*data_size = 0;
return buf_size;
- break;
default:
av_log(avctx, AV_LOG_ERROR, "unknown shorten function %d\n", cmd);
return -1;
- break;
}
}
frame_done:
diff --git a/libavformat/a64.c b/libavformat/a64.c
index 0e5576b651..3d313e5fba 100644
--- a/libavformat/a64.c
+++ b/libavformat/a64.c
@@ -55,7 +55,6 @@ static int a64_write_header(struct AVFormatContext *s)
break;
default:
return AVERROR(EINVAL);
- break;
}
avio_write(s->pb, header, 2);
c->prev_pkt.size = 0;
diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
index 8e991c57d9..d9315966ea 100644
--- a/libavformat/idroqdec.c
+++ b/libavformat/idroqdec.c
@@ -209,7 +209,6 @@ static int roq_read_packet(AVFormatContext *s,
default:
av_log(s, AV_LOG_ERROR, " unknown RoQ chunk (%04X)\n", chunk_type);
return AVERROR_INVALIDDATA;
- break;
}
}
diff --git a/libavformat/oma.c b/libavformat/oma.c
index 6fdf75f17c..0ec81ebefb 100644
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -149,7 +149,6 @@ static int oma_read_header(AVFormatContext *s,
default:
av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n",buf[32]);
return -1;
- break;
}
st->codec->block_align = framesize;
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index b7a9d3b250..646244238c 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -234,7 +234,6 @@ static int str_read_packet(AVFormatContext *s,
pkt->stream_index =
str->channels[channel].audio_stream_index;
return 0;
- break;
default:
av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]);
/* drop the sector and move on */
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index e57a9bf844..03483de737 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -152,7 +152,6 @@ static int wc3_read_header(AVFormatContext *s,
(uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24),
(uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24));
return AVERROR_INVALIDDATA;
- break;
}
fourcc_tag = avio_rl32(pb);