mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
1c0c19f8bd
* commit '884f7c975f0af25febe86660e87bf3b2165a0309': output example: set the stream timebase Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>