diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:44:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:44:28 +0100 |
| commit | de182701ac9e5c6f571e21ba1fffb1fa8d0f808d (patch) | |
| tree | 7cd842c2634db0ff70ef8c811c29511f3c97ac8d /libavfilter/avfilter.h | |
| parent | 9d6a27d5336550c131d2a45fc4b0e90c93e46aca (diff) | |
| parent | 4f4840377f8074c0b8f4c07e5c44226b2d4e79da (diff) | |
| download | ffmpeg-de182701ac9e5c6f571e21ba1fffb1fa8d0f808d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lagarith: Fix typo in printf format string
Conflicts:
libavcodec/lagarith.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
0 files changed, 0 insertions, 0 deletions