ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Jul 26
21:04:31 2014 +0200| [1c0c19f8bd4b3469ce054a0a78bc1edba0e30689] | committer:
Michael Niedermayer
Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
output example: set the stream timebase
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c0c19f8bd4b3469ce054a0a78bc1edba0e30689
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
