diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:50:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:50:29 +0100 |
| commit | 8e37603ac9612448b9dbe64a9988e489d961caee (patch) | |
| tree | 8cb8867550617190c4dfbc1bb8daec20051ad608 /doc/APIchanges | |
| parent | 35e88167eaed3823e2e02470c9d3bd0f1a2604f4 (diff) | |
| parent | 554fd5cd630073b8273aa044a6bdfd6f608209e9 (diff) | |
| download | ffmpeg-8e37603ac9612448b9dbe64a9988e489d961caee.tar.gz | |
Merge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10
* commit '554fd5cd630073b8273aa044a6bdfd6f608209e9':
ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
0 files changed, 0 insertions, 0 deletions