Commit 199c18a7 authored by Stefano Sabatini's avatar Stefano Sabatini

Fix weird indent in get_video_frame().

Originally committed as revision 26390 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent df17f6d5
...@@ -1546,32 +1546,32 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -1546,32 +1546,32 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
if (packet_queue_get(&is->videoq, pkt, 1) < 0) if (packet_queue_get(&is->videoq, pkt, 1) < 0)
return -1; return -1;
if(pkt->data == flush_pkt.data){ if (pkt->data == flush_pkt.data) {
avcodec_flush_buffers(is->video_st->codec); avcodec_flush_buffers(is->video_st->codec);
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
//Make sure there are no long delay timers (ideally we should just flush the que but thats harder) //Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++){ for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
is->pictq[i].target_clock= 0; is->pictq[i].target_clock= 0;
} }
while (is->pictq_size && !is->videoq.abort_request) { while (is->pictq_size && !is->videoq.abort_request) {
SDL_CondWait(is->pictq_cond, is->pictq_mutex); SDL_CondWait(is->pictq_cond, is->pictq_mutex);
} }
is->video_current_pos= -1; is->video_current_pos = -1;
SDL_UnlockMutex(is->pictq_mutex); SDL_UnlockMutex(is->pictq_mutex);
init_pts_correction(&is->pts_ctx); init_pts_correction(&is->pts_ctx);
is->frame_last_pts= AV_NOPTS_VALUE; is->frame_last_pts = AV_NOPTS_VALUE;
is->frame_last_delay = 0; is->frame_last_delay = 0;
is->frame_timer = (double)av_gettime() / 1000000.0; is->frame_timer = (double)av_gettime() / 1000000.0;
is->skip_frames= 1; is->skip_frames = 1;
is->skip_frames_index= 0; is->skip_frames_index = 0;
return 0; return 0;
} }
/* NOTE: ipts is the PTS of the _first_ picture beginning in /* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */ this packet, if any */
is->video_st->codec->reordered_opaque= pkt->pts; is->video_st->codec->reordered_opaque = pkt->pts;
len1 = avcodec_decode_video2(is->video_st->codec, len1 = avcodec_decode_video2(is->video_st->codec,
frame, &got_picture, frame, &got_picture,
pkt); pkt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment