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
..
asf
2012-05-17 03:29:21 +02:00
avi
2012-05-17 03:29:21 +02:00
dpx
2012-04-06 19:50:37 +02:00
2012-05-17 03:29:21 +02:00
ffm
2012-05-17 03:29:21 +02:00
gxf
2012-05-17 03:29:21 +02:00
jpg
2010-03-15 16:37:02 +00:00
mkv
2012-05-17 03:29:21 +02:00
mpg
2012-05-17 03:29:21 +02:00
nut
2012-05-17 03:29:21 +02:00
ogg
2012-05-17 03:29:21 +02:00
pam
2012-05-15 19:47:18 +01:00
rm
2012-05-17 03:29:21 +02:00
2012-03-03 20:57:03 -05:00
ts
2012-05-17 03:29:21 +02:00
wtv
2012-05-17 03:29:21 +02:00
xbm
2012-04-09 17:21:35 +02:00