[FFmpeg-cvslog] Merge commit '1688eef25385089026aba55da1885f70a57815ab'
Michael Niedermayer
git at videolan.org
Wed Aug 27 12:52:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 12:38:53 2014 +0200| [ad207f1119d961bb83177765226ee8f3b80e369f] | committer: Michael Niedermayer
Merge commit '1688eef25385089026aba55da1885f70a57815ab'
* commit '1688eef25385089026aba55da1885f70a57815ab':
avconv: fix the muxrate values for -target
Conflicts:
ffmpeg_opt.c
No change, as ffmpegs muxrate is in bits/sec
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad207f1119d961bb83177765226ee8f3b80e369f
---
More information about the ffmpeg-cvslog
mailing list