ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Nov 24
13:38:23 2014 +0100| [f41d409b7a6cc0295d45c4ac879f8df7d0cc9a76] | committer:
Michael Niedermayer
Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7'
* commit '55b59fab880a9fcdd30f97c5170af282087ac4f7':
roqaudio: Always use the frame buffer on flush
Conflicts:
libavcodec/roqaudioenc.c
See: a1af505d6640a89401f8e9941a38352a1ca49d58
See: c0b17ea106b94f79255f81ec36ea50096e1ae985
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f41d409b7a6cc0295d45c4ac879f8df7d0cc9a76
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
