diff options
| author | Philip Langdale <philipl@overt.org> | 2015-05-25 09:42:14 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2015-05-25 19:50:41 -0700 |
| commit | 9ae766d1c6983e6deec4a7bf783d1ef09ca5f3ad (patch) | |
| tree | 9801e82f27ce4570ed88294eb5d49703acb92519 /libavcodec/h264.c | |
| parent | 7ed5d78d619e45b46ba003e8014767b05b73b7d2 (diff) | |
| download | ffmpeg-streaming-9ae766d1c6983e6deec4a7bf783d1ef09ca5f3ad.zip ffmpeg-streaming-9ae766d1c6983e6deec4a7bf783d1ef09ca5f3ad.tar.gz | |
avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header
h264.h and hevc.h are mutually exclusive due to defining some of the same
names. As such, we need to avoid forcing h264.h to be included if we want
hevc decode acceleration to be possible.
However, some of the pre-hwaccel helper functions need h264.h. To avoid
messy collisions, let's move the declaration of all those helpers to
a separate header which we will exclude for the hevc support (which will
be hwaccel-only).
Signed-off-by: Philip Langdale <philipl@overt.org>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1ba0e95..9a00214 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -49,7 +49,7 @@ #include "rectangle.h" #include "svq3.h" #include "thread.h" -#include "vdpau_internal.h" +#include "vdpau_compat.h" const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 }; |
