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>

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;