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)
commit5b965a508ca3a5a3002d8d2449e03f4f6e5d7689
tree6d9c0f09ec5f3cd4fc7db456430e1aedd350498c
parent6cb8e40f4372a41dd72a001a72c17c0969f2a941
parent12e1a7013a53ad957c4ff11a3aebc0763024d24b
Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4

* 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>
libavcodec/roqaudioenc.c