History

ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2

This fixes some warnings about unused-but-set variables.

Diego Biurrun committed 15 years ago

Commit 98704131 parent 828e2071 file · +6 −8Browse files

Unified · Split

ffplay.c+6−8
@@ -1457,7 +1457,7 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6 · 1456 unmodified lines
14571457
14581458 static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
14591459 {
1460− int len1, got_picture, i;
1460+ int got_picture, i;
14611461
14621462 if (packet_queue_get(&is->videoq, pkt, 1) < 0)
14631463 return -1;
@@ -1485,9 +1485,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke · 21 unmodified lines
14851485 return 0;
14861486 }
14871487
1488− len1 = avcodec_decode_video2(is->video_st->codec,
1489− frame, &got_picture,
1490− pkt);
1488+ avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
14911489
14921490 if (got_picture) {
14931491 if (decoder_reorder_pts == -1) {
@@ -1828,7 +1826,7 @@ static int subtitle_thread(void *arg) · 334 unmodified lines
18281826 VideoState *is = arg;
18291827 SubPicture *sp;
18301828 AVPacket pkt1, *pkt = &pkt1;
1831− int len1, got_subtitle;
1829+ int got_subtitle;
18321830 double pts;
18331831 int i, j;
18341832 int r, g, b, y, u, v, a;
@@ -1862,9 +1860,9 @@ static int subtitle_thread(void *arg) · 27 unmodified lines
18621860 if (pkt->pts != AV_NOPTS_VALUE)
18631861 pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
18641862
1865− len1 = avcodec_decode_subtitle2(is->subtitle_st->codec,
1866− &sp->sub, &got_subtitle,
1867− pkt);
1863+ avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
1864+ &got_subtitle, pkt);
1865+
18681866 if (got_subtitle && sp->sub.format == 0) {
18691867 sp->pts = pts;
18701868

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t