diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
| commit | de2cfb744a207cc09bc961c859d7ae91cb6192b4 (patch) | |
| tree | 0a78680e2bcacd76b6b16b2d39005f74aa76ae05 /libavcodec/wmv2.c | |
| parent | 847943bc51098dbd68301099ed132cdde0f9eabf (diff) | |
| parent | 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f (diff) | |
| download | ffmpeg-de2cfb744a207cc09bc961c859d7ae91cb6192b4.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmv2.c')
0 files changed, 0 insertions, 0 deletions