diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 18:37:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 19:23:37 +0200 |
| commit | 72872d020144d9684312e4c3b212a4ff139599ca (patch) | |
| tree | f577b9c472b2a8e6eea67d217d7574a469165d9c /libswresample/swresample.c | |
| parent | c5c355546deeae961363aa6893f4e5b3a0b0f790 (diff) | |
| download | ffmpeg-72872d020144d9684312e4c3b212a4ff139599ca.tar.gz | |
swr: Fix issue with injecting more data than can be used up in the next call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index d8a066f072..4718ce8615 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -667,7 +667,7 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun ret2 += ret; } if(in_count){ - buf_set(&tmp, &s->in_buffer, s->in_buffer_index); + buf_set(&tmp, &s->in_buffer, s->in_buffer_index + s->in_buffer_count); copy(&tmp, in, in_count); s->in_buffer_count += in_count; } |