generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2

Browse Source 
This fixes some warnings about unused-but-set variables.
This commit is contained in:
Diego Biurrun 2011-07-11 17:04:15 +02:00
parent 828e207337
commit 987041318f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplay.c
View File

@ -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) 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) if (packet_queue_get(&is->videoq, pkt, 1) < 0)
return -1; return -1;
@ -1485,9 +1485,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
return 0; return 0;
} }
len1 = avcodec_decode_video2(is->video_st->codec, avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
frame, &got_picture,
pkt);
if (got_picture) { if (got_picture) {
if (decoder_reorder_pts == -1) { if (decoder_reorder_pts == -1) {
@ -1828,7 +1826,7 @@ static int subtitle_thread(void *arg)
VideoState *is = arg; VideoState *is = arg;
SubPicture *sp; SubPicture *sp;
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
int len1, got_subtitle; int got_subtitle;
double pts; double pts;
int i, j; int i, j;
int r, g, b, y, u, v, a; int r, g, b, y, u, v, a;
@ -1862,9 +1860,9 @@ static int subtitle_thread(void *arg)
if (pkt->pts != AV_NOPTS_VALUE) if (pkt->pts != AV_NOPTS_VALUE)
pts = av_q2d(is->subtitle_st->time_base)*pkt->pts; pts = av_q2d(is->subtitle_st->time_base)*pkt->pts;
len1 = avcodec_decode_subtitle2(is->subtitle_st->codec, avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
&sp->sub, &got_subtitle, &got_subtitle, pkt);
pkt);
if (got_subtitle && sp->sub.format == 0) { if (got_subtitle && sp->sub.format == 0) {
sp->pts = pts; sp->pts = pts;