eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 07:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae1ab8265bad5481b5842ee3aff4872d1fe4d34d
ffmpeg/ffprobe.c
Michael Niedermayer de2cfb744a Merge remote-tracking branch 'qatar/master' 
* 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>
2012-05-17 23:45:00 +02:00

60 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink