diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:58:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 01:28:04 +0100 |
| commit | ee9d53e5726250295cfe0b9e67518fdd1475390e (patch) | |
| tree | 49c8d062310d87707522dee0db6efdc3d084fce3 /libavcodec/vdpau_internal.h | |
| parent | 2d2b363c652403ac0bda129912e1910aacdaa3fc (diff) | |
| parent | 48e139409556861c9e561ce34133891d8eecc3cf (diff) | |
| download | ffmpeg-ee9d53e5726250295cfe0b9e67518fdd1475390e.tar.gz | |
Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'
* commit '48e139409556861c9e561ce34133891d8eecc3cf':
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 32969963c7..cc634111b4 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -32,6 +32,7 @@ #include "h264.h" #include "avcodec.h" +#include "mpeg4video.h" #include "mpegvideo.h" #include "version.h" @@ -95,7 +96,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h); void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf, int buf_size); -void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf, +void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *s, const uint8_t *buf, int buf_size); #endif /* AVCODEC_VDPAU_INTERNAL_H */ |