Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 21:45:00 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 21:45:00 +0000 (23:45 +0200)
commitde2cfb744a207cc09bc961c859d7ae91cb6192b4
tree0a78680e2bcacd76b6b16b2d39005f74aa76ae05
parent847943bc51098dbd68301099ed132cdde0f9eabf
parent7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f
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>
ffprobe.c
libavcodec/pcm.c
tests/fate/probe.mak
tests/ref/lavf/mov