[FFmpeg-cvslog] Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 02:08:33 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:00:00 2015 +0100| [5b965a508ca3a5a3002d8d2449e03f4f6e5d7689] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b965a508ca3a5a3002d8d2449e03f4f6e5d7689
---
More information about the ffmpeg-cvslog
mailing list