Error checking is already done by inspecting the got_picture/got_subtitle
parameters. This fixes some warnings about unused-but-set variables.
---
ffplay.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index 7e61fb1..bbbf5c6 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1457,7 +1457,7 @@ static int output_picture2(VideoState *is, AVFrame
*src_frame, double pts1, int6
static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts,
AVPacket *pkt)
{
- int len1, got_picture, i;
+ int got_picture, i;
if (packet_queue_get(&is->videoq, pkt, 1) < 0)
return -1;
@@ -1485,9 +1485,7 @@ static int get_video_frame(VideoState *is, AVFrame
*frame, int64_t *pts, AVPacke
return 0;
}
- len1 = avcodec_decode_video2(is->video_st->codec,
- frame, &got_picture,
- pkt);
+ avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
if (got_picture) {
if (decoder_reorder_pts == -1) {
@@ -1828,7 +1826,7 @@ static int subtitle_thread(void *arg)
VideoState *is = arg;
SubPicture *sp;
AVPacket pkt1, *pkt = &pkt1;
- int len1, got_subtitle;
+ int got_subtitle;
double pts;
int i, j;
int r, g, b, y, u, v, a;
@@ -1862,9 +1860,9 @@ static int subtitle_thread(void *arg)
if (pkt->pts != AV_NOPTS_VALUE)
pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
- len1 = avcodec_decode_subtitle2(is->subtitle_st->codec,
- &sp->sub, &got_subtitle,
- pkt);
+ avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
+ &got_subtitle, pkt);
+
if (got_subtitle && sp->sub.format == 0) {
sp->pts = pts;
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
