Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:00:00 +0000 (02:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:00:21 +0000 (02:00 +0100)
* commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b':
  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