diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 13:38:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 13:40:06 +0100 |
| commit | f41d409b7a6cc0295d45c4ac879f8df7d0cc9a76 (patch) | |
| tree | 50a1df5c1a4eecd7fb6332cccf4ec5dc85d9175b | |
| parent | d2e0543766e0c8c077ab51495991f47066d9e768 (diff) | |
| parent | 55b59fab880a9fcdd30f97c5170af282087ac4f7 (diff) | |
| download | ffmpeg-f41d409b7a6cc0295d45c4ac879f8df7d0cc9a76.tar.gz | |
Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7'
* commit '55b59fab880a9fcdd30f97c5170af282087ac4f7':
roqaudio: Always use the frame buffer on flush
Conflicts:
libavcodec/roqaudioenc.c
See: a1af505d6640a89401f8e9941a38352a1ca49d58
See: c0b17ea106b94f79255f81ec36ea50096e1ae985
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/roqaudioenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index b0b76d0883..2c59074fce 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -148,9 +148,8 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } } - if (context->input_frames < 8) { + if (context->input_frames < 8) in = context->frame_buffer; - } if (stereo) { context->lastSample[0] &= 0xFF00; |