[FFmpeg-cvslog] avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning
Michael Niedermayer
git at videolan.org
Thu Aug 28 16:09:55 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 16:03:28 2014 +0200| [ef768ab9763d265a69d606ca55ad465c272d0b94] | committer: Michael Niedermayer
avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef768ab9763d265a69d606ca55ad465c272d0b94
---
libavcodec/h264.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ed1365d..8ed9f48 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2005,13 +2005,6 @@ static const AVClass h264_class = {
.version = LIBAVUTIL_VERSION_INT,
};
-static const AVClass h264_vdpau_class = {
- .class_name = "H264 VDPAU Decoder",
- .item_name = av_default_item_name,
- .option = h264_options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
AVCodec ff_h264_decoder = {
.name = "h264",
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
@@ -2032,6 +2025,13 @@ AVCodec ff_h264_decoder = {
};
#if CONFIG_H264_VDPAU_DECODER
+static const AVClass h264_vdpau_class = {
+ .class_name = "H264 VDPAU Decoder",
+ .item_name = av_default_item_name,
+ .option = h264_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVCodec ff_h264_vdpau_decoder = {
.name = "h264_vdpau",
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
More information about the ffmpeg-cvslog
mailing list