diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:21:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:27:07 +0200 |
| commit | 1b58f1376132026a7633fea253f0ed67a8392343 (patch) | |
| tree | a9c9f17d083967a9e231643e8fee155f9f678a6c /libavcodec/dv.c | |
| parent | 9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2 (diff) | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
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.c')
| -rw-r--r-- | libavcodec/dv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 745ebfe7c9..25f53a7c62 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -51,7 +51,7 @@ /* XXX: also include quantization */ RL_VLC_ELEM ff_dv_rl_vlc[1184]; -static inline void dv_calc_mb_coordinates(const DVprofile *d, int chan, int seq, int slot, +static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan, int seq, int slot, uint16_t *tbl) { static const uint8_t off[] = { 2, 6, 8, 0, 4 }; @@ -175,7 +175,7 @@ static const uint8_t dv100_qstep[16] = { static const uint8_t dv_quant_areas[4] = { 6, 21, 43, 64 }; -int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const DVprofile *d) +int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const AVDVProfile *d) { int j,i,c,s,p; uint32_t *factor1, *factor2; |