diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 22:51:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 22:59:16 +0100 |
| commit | e33b084ee98664d8f467ea16cdf75643d167b089 (patch) | |
| tree | 41f1df94dfb74a62691599aa3903bb14151f27f8 | |
| parent | dfa7cb646d2093caf5a8d6025cb2845d257e040b (diff) | |
| parent | ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f (diff) | |
| download | ffmpeg-e33b084ee98664d8f467ea16cdf75643d167b089.tar.gz | |
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vdpau_internal.h | 4 | ||||
| -rw-r--r-- | libavcodec/vdpau_mpeg12.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index e5fe63dd19..cc49db8433 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -31,10 +31,10 @@ #endif #include "h264.h" +#include "libavutil/frame.h" + #include "avcodec.h" #include "mpeg4video.h" -#include "mpegvideo.h" -#include "version.h" /** Extract VdpVideoSurface from an AVFrame */ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic) diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index c47e50e0ec..3ac2cb827d 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -24,6 +24,7 @@ #include <vdpau/vdpau.h> #include "avcodec.h" +#include "mpegvideo.h" #include "vdpau.h" #include "vdpau_internal.h" |