diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
| commit | df5fbeb013e70f14090cec1998a5f923d6713a1d (patch) | |
| tree | de31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/dv.c | |
| parent | 26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff) | |
| download | xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2 | |
merge ffmpeg to fix compiler warnings
CVS patchset: 6612
CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/dv.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/dv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/dv.c b/src/libffmpeg/libavcodec/dv.c index c62c964fb..8e359e361 100644 --- a/src/libffmpeg/libavcodec/dv.c +++ b/src/libffmpeg/libavcodec/dv.c @@ -171,8 +171,12 @@ static int dvvideo_init(AVCodecContext *avctx) free_vlc(&dv_vlc); for (i = 0; i < NB_DV_VLC - 1; i++) { - if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE || dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) + if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) continue; +#ifdef DV_CODEC_TINY_TARGET + if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) + continue; +#endif if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) continue; @@ -885,7 +889,6 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, { DVVideoContext *s = avctx->priv_data; - *data_size=0; /* special case for last picture */ if(buf_size==0) return 0; |