diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-07 11:35:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-07 11:35:59 +0200 |
| commit | b7ce510003275460a9b02361a8c98bfec6fa2945 (patch) | |
| tree | 724100234911165f50bce4621ba25cb5eb5e5d9e /libavformat/amr.c | |
| parent | 7bd417c22a90a712df57cacfa5b09c1fb4f6183a (diff) | |
| parent | a4baf96abd64cda68e3e4692b182bdf60745a14d (diff) | |
Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'
* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
avprobe: rename the prettyprint structures
tools: Wording and formatting cosmetics
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions