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/adpcm.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/adpcm.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/adpcm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/adpcm.c b/src/libffmpeg/libavcodec/adpcm.c index 2ce7dc87f..0755e24fe 100644 --- a/src/libffmpeg/libavcodec/adpcm.c +++ b/src/libffmpeg/libavcodec/adpcm.c @@ -568,7 +568,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if(st) { /* handle stereo interlacing */ c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */ if(channel == 1) { /* wait for the other packet before outputing anything */ - *data_size = 0; return src - buf; } } @@ -842,7 +841,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, } break; default: - *data_size = 0; return -1; } *data_size = (uint8_t *)samples - (uint8_t *)data; |