diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
commit | b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed (patch) | |
tree | 5055beedccbbf7f81f523598117a09755dc6b083 /libavcodec/h264_picture.c | |
parent | f192f2f061d979e3d2716b9892ca276b5d5cd418 (diff) | |
parent | dd343fd986459f467a2d1d70c26101dff1d47d68 (diff) |
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
lavu: Drop deprecated VDPAU pixel formats
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_picture.c')
-rw-r--r-- | libavcodec/h264_picture.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 30987d3145..e7dd84bc47 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -41,7 +41,6 @@ #include "mpegutils.h" #include "rectangle.h" #include "thread.h" -#include "vdpau_compat.h" void ff_h264_unref_picture(H264Context *h, H264Picture *pic) { |