diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:40:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:40:35 +0100 |
| commit | 1046cd60d4b19d6376dd18164959c3ea30477855 (patch) | |
| tree | c1f2921d1f0e50bbaeb0a0868e8a1ec88c80dddb /libavcodec/amrwbdec.c | |
| parent | afa442c198fcbfe587887a4318d61e19539afc2d (diff) | |
| parent | 4754345027eb85cfa51aeb88beec68d7b036c11e (diff) | |
| download | ffmpeg-1046cd60d4b19d6376dd18164959c3ea30477855.tar.gz | |
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
avconv: print verbose per-stream transcoding statistics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrwbdec.c')
0 files changed, 0 insertions, 0 deletions