diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-03 16:45:21 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-03 16:45:21 +0300 |
| commit | ce0bf1bd4a3cc735f1a38988a6034bb48dcec2d6 (patch) | |
| tree | 4811f91ef92e4893707e10320e328865b16ab51f | |
| parent | 35a7dfc7370bac2f659108b8d97f2a53adb4acc3 (diff) | |
| parent | a9d4cebae0fb44f99201cc3455a72cabecdbdb23 (diff) | |
| download | mpv-ce0bf1bd4a3cc735f1a38988a6034bb48dcec2d6.tar.bz2 mpv-ce0bf1bd4a3cc735f1a38988a6034bb48dcec2d6.tar.xz | |
Merge svn changes up to r29136
Fixes compilation with latest FFmpeg.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | etc/codecs.conf | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -8881,6 +8881,8 @@ $def_xvid_lavc #define CONFIG_MPEG2_VAAPI_HWACCEL 0 #define CONFIG_MPEG4_VAAPI_HWACCEL 0 #define CONFIG_H264_VAAPI_HWACCEL 0 +#define CONFIG_VC1_VAAPI_HWACCEL 0 +#define CONFIG_WMV3_VAAPI_HWACCEL 0 #endif /* MPLAYER_CONFIG_H */ EOF diff --git a/etc/codecs.conf b/etc/codecs.conf index 1c51043940..e7a8fc80df 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1529,6 +1529,7 @@ videocodec ffdv fourcc DVCS,dvcs ; NTSC ? fourcc "dvcp" ; PAL DV in .mov fourcc "dvc " ; NTSC DV in .mov + fourcc "dvp " fourcc dvpp ; DVCPRO - PAL fourcc dv50 ; DVCPRO 50 fourcc dv5n ; DVCPRO 50 NTSC in .mov @@ -1537,6 +1538,7 @@ videocodec ffdv fourcc dvhq,dvhp fourcc dvh5,dvh6,dvh3 fourcc dvhd,dvsl,dv25 + fourcc dvs1 driver ffmpeg dll dvvideo out 411P,422P,YV12 |