diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /compat/libav.h | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'compat/libav.h')
| -rw-r--r-- | compat/libav.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/compat/libav.h b/compat/libav.h index 62ce1bb529..ba5250b5f3 100644 --- a/compat/libav.h +++ b/compat/libav.h @@ -28,21 +28,4 @@ #define AV_CPU_FLAG_MMX2 AV_CPU_FLAG_MMXEXT #endif -#if (LIBAVUTIL_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 53, 100)) -#define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT -#endif - -#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 36, 0) -#define av_get_packed_sample_fmt(x) (x) -#endif - -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) -#define avcodec_free_frame av_freep -#endif - -// For Libav 0.9 -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 2, 100) -#define AV_DISPOSITION_ATTACHED_PIC 0x0400 -#endif - #endif /* MPV_LIBAV_COMPAT_H */ |