comparison libmpcodecs/vd_ffmpeg.c @ 33152:0c2838570652

Revert r33231, FFmpeg already sets has_b_frames up this way for frame-multithreading.
author reimar
date Sat, 09 Apr 2011 14:11:36 +0000
parents a2a32138597b
children 0ee0e309677b
comparison
equal deleted inserted replaced
33151:ffcc4e307a43 33152:0c2838570652
171 } 171 }
172 case VDCTRL_RESYNC_STREAM: 172 case VDCTRL_RESYNC_STREAM:
173 avcodec_flush_buffers(avctx); 173 avcodec_flush_buffers(avctx);
174 return CONTROL_TRUE; 174 return CONTROL_TRUE;
175 case VDCTRL_QUERY_UNSEEN_FRAMES: 175 case VDCTRL_QUERY_UNSEEN_FRAMES:
176 if (avctx->active_thread_type & FF_THREAD_FRAME) 176 // has_b_frames includes delay due to frame-multithreading
177 return avctx->has_b_frames + avctx->thread_count + 10;
178 return avctx->has_b_frames + 10; 177 return avctx->has_b_frames + 10;
179 } 178 }
180 return CONTROL_UNKNOWN; 179 return CONTROL_UNKNOWN;
181 } 180 }
182 181