This fixes some warnings about unused-but-set variables.
Unified · Split
| @@ -1457,7 +1457,7 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6 · 1456 unmodified lines | |||
| 1457 | 1457 | ||
| 1458 | static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt) | 1458 | static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt) |
| 1459 | { | 1459 | { |
| 1460 | int len1, got_picture, i; | 1460 | int got_picture, i; |
| 1461 | 1461 | ||
| 1462 | if (packet_queue_get(&is->videoq, pkt, 1) < 0) | 1462 | if (packet_queue_get(&is->videoq, pkt, 1) < 0) |
| 1463 | return -1; | 1463 | return -1; |
| @@ -1485,9 +1485,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke · 21 unmodified lines | |||
| 1485 | return 0; | 1485 | return 0; |
| 1486 | } | 1486 | } |
| 1487 | 1487 | ||
| 1488 | len1 = avcodec_decode_video2(is->video_st->codec, | 1488 | avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt); |
| 1489 | frame, &got_picture, | ||
| 1490 | pkt); | ||
| 1491 | 1489 | ||
| 1492 | if (got_picture) { | 1490 | if (got_picture) { |
| 1493 | if (decoder_reorder_pts == -1) { | 1491 | if (decoder_reorder_pts == -1) { |
| @@ -1828,7 +1826,7 @@ static int subtitle_thread(void *arg) · 334 unmodified lines | |||
| 1828 | VideoState *is = arg; | 1826 | VideoState *is = arg; |
| 1829 | SubPicture *sp; | 1827 | SubPicture *sp; |
| 1830 | AVPacket pkt1, *pkt = &pkt1; | 1828 | AVPacket pkt1, *pkt = &pkt1; |
| 1831 | int len1, got_subtitle; | 1829 | int got_subtitle; |
| 1832 | double pts; | 1830 | double pts; |
| 1833 | int i, j; | 1831 | int i, j; |
| 1834 | int r, g, b, y, u, v, a; | 1832 | int r, g, b, y, u, v, a; |
| @@ -1862,9 +1860,9 @@ static int subtitle_thread(void *arg) · 27 unmodified lines | |||
| 1862 | if (pkt->pts != AV_NOPTS_VALUE) | 1860 | if (pkt->pts != AV_NOPTS_VALUE) |
| 1863 | pts = av_q2d(is->subtitle_st->time_base)*pkt->pts; | 1861 | pts = av_q2d(is->subtitle_st->time_base)*pkt->pts; |
| 1864 | 1862 | ||
| 1865 | len1 = avcodec_decode_subtitle2(is->subtitle_st->codec, | 1863 | avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub, |
| 1866 | &sp->sub, &got_subtitle, | 1864 | &got_subtitle, pkt); |
| 1867 | pkt); | 1865 | |
| 1868 | if (got_subtitle && sp->sub.format == 0) { | 1866 | if (got_subtitle && sp->sub.format == 0) { |
| 1869 | sp->pts = pts; | 1867 | sp->pts = pts; |
| 1870 | 1868 | ||