Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:38:23 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:40:06 +0000 (13:40 +0100)
* 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>
1  2 
libavcodec/roqaudioenc.c

Simple merge