[FFmpeg-cvslog] Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
Michael Niedermayer
git at videolan.org
Mon Mar 24 16:00:43 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 15:48:19 2014 +0100| [8a9878b4ff233abf59924355e5121cb03bbfb7cd] | committer: Michael Niedermayer
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
avconv: explicitly report when the muxing overhead is unknown
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a9878b4ff233abf59924355e5121cb03bbfb7cd
---
More information about the ffmpeg-cvslog
mailing list