diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:15:19 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:15:19 +0300 |
| commit | 5266b5de98aa57dd99bb1f1ac5a40ebf4f23b7c2 (patch) | |
| tree | 33fff4644d6e1a3aa84208c363239f2b24eea2c0 /libmpcodecs | |
| parent | e1cd86076fc830bf2d475539543cf3dacc287ca7 (diff) | |
| download | mpv-5266b5de98aa57dd99bb1f1ac5a40ebf4f23b7c2.tar.bz2 mpv-5266b5de98aa57dd99bb1f1ac5a40ebf4f23b7c2.tar.xz | |
vd_ffmpeg: remove #ifdef for old FFmpeg-mt versions
The #ifdef is obsolete since trying to compile against the relevant
old versions will fail for other reasons.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 72a19cd14d..d6b5a82ccd 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -152,12 +152,6 @@ static int control(sh_video_t *sh, int cmd, void *arg, ...){ return CONTROL_TRUE; case VDCTRL_QUERY_UNSEEN_FRAMES:; int delay = avctx->has_b_frames; -#if defined(FF_THREAD_FRAME) && LIBAVCODEC_VERSION_MAJOR <= 52 && LIBAVCODEC_VERSION_MINOR < 49 - // FFmpeg-mt has extra delay when using frame threading - // In newer versions that is included in has_b_frames - if (avctx->thread_type & FF_THREAD_FRAME) - delay += avctx->thread_count - 1; -#endif return delay + 10; } return CONTROL_UNKNOWN; |