diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
| commit | cfc40a6aff8d35627469ef960531264c2f66a74e (patch) | |
| tree | 8b153d939fe63d808438c444b464be66c81c4ae2 /libavcodec/vdpau_internal.h | |
| parent | 24d06cb2089fbe74912e82d613b8c166be1386a8 (diff) | |
| parent | d8c772de53d29afb1bada88afa859fce8489c668 (diff) | |
| download | ffmpeg-cfc40a6aff8d35627469ef960531264c2f66a74e.tar.gz | |
Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'
* commit 'd8c772de53d29afb1bada88afa859fce8489c668':
nutdec: Always return a value from nut_read_timestamp()
configure: Make warnings from -Wreturn-type fatal errors
x86: ABS2: port to cpuflags
vdpau: Remove av_unused attribute from function declaration
h264: fix ff_generate_sliding_window_mmcos() prototype.
Conflicts:
configure
libavformat/nutdec.c
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, 1 insertions, 2 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index f50ae77016..33f03cffd9 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -34,8 +34,7 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) } int ff_vdpau_common_start_frame(AVCodecContext *avctx, - av_unused const uint8_t *buffer, - av_unused uint32_t size); + const uint8_t *buffer, uint32_t size); int ff_vdpau_common_end_frame(AVCodecContext *avctx); int ff_vdpau_add_buffer(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size); |