mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
8eb1174a9e
* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3': output example: use a struct to bundle the video stream variables together Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>