diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 12:12:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 12:13:42 +0100 |
| commit | 6321e02896350f3ff3a3531dc5484e145c4ea524 (patch) | |
| tree | 89e73ef5c3fd7b702e568efc28e48af968b9a9d6 /libavcodec/png.c | |
| parent | f540851ce320bc69621ea70b89857c54129c82c2 (diff) | |
| parent | ccb59c106a4361b9655aa094b042863d655860c4 (diff) | |
| download | ffmpeg-6321e02896350f3ff3a3531dc5484e145c4ea524.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Remove an outdated todo comment
rtpdec: Rename a static variable to normal naming conventions
sh4: dsputil: remove duplicate of ff_gmc_c()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png.c')
0 files changed, 0 insertions, 0 deletions