summaryrefslogtreecommitdiff
path: root/libavcodec/dv.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 22:21:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 22:27:07 +0200
commit1b58f1376132026a7633fea253f0ed67a8392343 (patch)
treea9c9f17d083967a9e231643e8fee155f9f678a6c /libavcodec/dv.h
parent9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2 (diff)
parentf6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff)
downloadffmpeg-1b58f1376132026a7633fea253f0ed67a8392343.tar.gz
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.h')
-rw-r--r--libavcodec/dv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index 63530109dc..54ac06a65e 100644
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.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))