Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header

Browse source 
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>
This commit is contained in:
Philip Langdale 2015-05-25 09:42:14 -07:00
parent 7ed5d78d61
commit 9ae766d1c6
8 changed files with 54 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/h264.c
View file

@ -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 };