mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
de2cfb744a
* qatar/master: pcmenc: set correct bitrate value avprobe: don't print format entry name when only one was requested Conflicts: ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>