diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-31 03:19:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:55 +0200 |
| commit | c5e462b33d6db445b1c763e89320b1bcb214debb (patch) | |
| tree | 5091b402fb3cc768fa5dbc718d5681d3d78d191f /mpcommon.c | |
| parent | 389c32b5c72897a8b1b3c929c8f278e8980f2290 (diff) | |
| download | mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.bz2 mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.xz | |
build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc
together (libavutil is always required).
based on svn commit by diego:
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.c')
| -rw-r--r-- | mpcommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mpcommon.c b/mpcommon.c index 962c0da4d2..8097fe002e 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -115,7 +115,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, spudec_reset(vo_spudec); vo_osd_changed(OSDTYPE_SPU); } -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG if (is_av_sub(type)) reset_avsub(d_dvdsub->sh); #endif @@ -203,7 +203,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, double endpts = d_dvdsub->first->endpts + sub_offset; len = ds_get_packet_sub(d_dvdsub, &packet); if (is_av_sub(type)) { -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG type = decode_avsub(d_dvdsub->sh, &packet, &len, &subpts, &endpts); if (type <= 0) #endif |