1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 1c0c19f8bd Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
  output example: set the stream timebase

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26 21:04:31 +02:00
..
2014-07-20 02:01:50 +02:00
2014-07-20 23:58:36 +02:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-07-08 02:11:19 +02:00
2014-05-28 03:52:50 +02:00
2014-07-20 23:58:36 +02:00
2014-07-17 11:29:01 +02:00