generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4

Browse Source 
* commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b':
  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
2015-01-18 02:00:00 +01:00
parent 6cb8e40f43 12e1a7013a
commit 5b965a508c
1 changed files with 1 additions and 2 deletions
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;