RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7' 

* commit '55b59fab880a9fcdd30f97c5170af282087ac4f7':
  roqaudio: Always use the frame buffer on flush

Conflicts:
	libavcodec/roqaudioenc.c

See: a1af505d66
See: c0b17ea106
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-24 13:38:23 +01:00
parent d2e0543766 55b59fab88
commit f41d409b7a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/roqaudioenc.c
View File

@ -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;