Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'

[ffmpeg] / libavcodec / dv.h

diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index 63530109dcabff4111c767b423430f47e7c74672..14cfbce1949dd9601e96c801cb9df004348d6d14 100644 (file)
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -28,7 +28,7 @@
 #define AVCODEC_DV_H
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "me_cmp.h"
 #include "get_bits.h"
 #include "dv_profile.h"
 
@@ -38,7 +38,7 @@ typedef struct DVwork_chunk {
 } DVwork_chunk;
 
 typedef struct DVVideoContext {
-    const DVprofile *sys;
+    const AVDVProfile *sys;
     AVFrame         *frame;
     AVCodecContext  *avctx;
     uint8_t         *buf;
@@ -95,10 +95,10 @@ enum dv_pack_type {
 
 extern RL_VLC_ELEM ff_dv_rl_vlc[1184];
 
-int ff_dv_init_dynamic_tables(DVVideoContext *s, const DVprofile *d);
+int ff_dv_init_dynamic_tables(DVVideoContext *s, const AVDVProfile *d);
 int ff_dvvideo_init(AVCodecContext *avctx);
 
-static inline int dv_work_pool_size(const DVprofile *d)
+static inline int dv_work_pool_size(const AVDVProfile *d)
 {
     int size = d->n_difchan*d->difseg_size*27;
     if (DV_PROFILE_IS_1080i50(d))