This removes unnecessary header dependencies.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/h263dec.c | 6 ++++--
libavcodec/h264_picture.c | 12 ++++++------
libavcodec/h264dec.c | 13 +++++++------
libavcodec/mpeg12dec.c | 7 ++++---
libavcodec/vc1dec.c | 7 ++++---
5 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index d0da1d3..953bbc5 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -41,7 +41,9 @@
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "qpeldsp.h"
+#if FF_API_CAP_VDPAU && CONFIG_MPEG4_VDPAU_DECODER
#include "vdpau_compat.h"
+#endif
#include "thread.h"
#include "wmv2.h"
@@ -603,8 +605,8 @@ retry:
if (!s->divx_packed && !avctx->hwaccel)
ff_thread_finish_setup(avctx);
-#if FF_API_CAP_VDPAU
- if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities &
AV_CODEC_CAP_HWACCEL_VDPAU)) {
+#if FF_API_CAP_VDPAU && CONFIG_MPEG4_VDPAU_DECODER
+ if (s->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) {
ff_vdpau_mpeg4_decode_picture(avctx->priv_data, s->gb.buffer,
s->gb.buffer_end - s->gb.buffer);
goto frame_end;
}
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index f634d2a..a721b8d 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -41,7 +41,9 @@
#include "mpegutils.h"
#include "rectangle.h"
#include "thread.h"
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
#include "vdpau_compat.h"
+#endif
void ff_h264_unref_picture(H264Context *h, H264Picture *pic)
{
@@ -156,9 +158,8 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl,
int in_setup)
int err = 0;
h->mb_y = 0;
-#if FF_API_CAP_VDPAU
- if (CONFIG_H264_VDPAU_DECODER &&
- h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
+ if (h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_set_reference_frames(h);
#endif
@@ -179,9 +180,8 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl,
int in_setup)
"hardware accelerator failed to decode picture\n");
}
-#if FF_API_CAP_VDPAU
- if (CONFIG_H264_VDPAU_DECODER &&
- h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
+ if (h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_picture_complete(h);
#endif
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 323639d..35df360 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -50,10 +50,13 @@
#include "mathops.h"
#include "me_cmp.h"
#include "mpegutils.h"
+#include "mpegvideo.h"
#include "profiles.h"
#include "rectangle.h"
#include "thread.h"
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
#include "vdpau_compat.h"
+#endif
static int h264_decode_end(AVCodecContext *avctx);
@@ -844,9 +847,8 @@ again:
if (h->avctx->hwaccel &&
(ret = h->avctx->hwaccel->start_frame(h->avctx, buf,
buf_size)) < 0)
goto end;
-#if FF_API_CAP_VDPAU
- if (CONFIG_H264_VDPAU_DECODER &&
- h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
+ if (h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_picture_start(h);
#endif
}
@@ -858,9 +860,8 @@ again:
nal->raw_size);
if (ret < 0)
goto end;
-#if FF_API_CAP_VDPAU
- } else if (CONFIG_H264_VDPAU_DECODER &&
- h->avctx->codec->capabilities &
AV_CODEC_CAP_HWACCEL_VDPAU) {
+#if FF_API_CAP_VDPAU && CONFIG_H264_VDPAU_DECODER
+ } else if (h->avctx->codec->capabilities &
AV_CODEC_CAP_HWACCEL_VDPAU) {
ff_vdpau_add_data_chunk(h->cur_pic_ptr->f->data[0],
start_code,
sizeof(start_code));
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 204a578..9f3daa3 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -47,7 +47,9 @@
#include "profiles.h"
#include "thread.h"
#include "version.h"
+#if FF_API_VDPAU && (CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
#include "vdpau_compat.h"
+#endif
#include "xvmc_internal.h"
typedef struct Mpeg1Context {
@@ -2433,9 +2435,8 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame
*picture,
s2->er.error_count +=
s2->thread_context[i]->er.error_count;
}
-#if FF_API_VDPAU
- if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
- && uses_vdpau(avctx))
+#if FF_API_VDPAU && (CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
+ if (uses_vdpau(avctx))
ff_vdpau_mpeg_picture_complete(s2, buf, buf_size,
s->slice_count);
#endif
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 4f78aa8..dfe476a 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -37,7 +37,9 @@
#include "profiles.h"
#include "vc1.h"
#include "vc1data.h"
+#if FF_API_CAP_VDPAU && CONFIG_VC1_VDPAU_DECODER
#include "vdpau_compat.h"
+#endif
#include "libavutil/avassert.h"
@@ -909,9 +911,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void
*data,
s->me.qpel_put = s->qdsp.put_qpel_pixels_tab;
s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
-#if FF_API_CAP_VDPAU
- if ((CONFIG_VC1_VDPAU_DECODER)
- &&s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) {
+#if FF_API_CAP_VDPAU && CONFIG_VC1_VDPAU_DECODER
+ if (s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) {
if (v->field_mode && buf_start_second_field) {
ff_vdpau_vc1_decode_picture(s, buf_start, buf_start_second_field -
buf_start);
ff_vdpau_vc1_decode_picture(s, buf_start_second_field, (buf +
buf_size) - buf_start_second_field);
--
2.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
