mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f': avprobe: Export coded_{width,height} in -show_streams Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>