diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 04:16:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 04:16:47 +0200 |
| commit | 13aa5757643eb05da27077acdde4a876a6e50d75 (patch) | |
| tree | 87e3c08e6648a58a743f58e532bdfdd0f0019b4e /libavcodec/pnmenc.c | |
| parent | a6fa3a476afb29ff3bcc3e5acedc11c2a90e9e03 (diff) | |
| parent | 486e3649cef50190105265fc51846e72d908d1bb (diff) | |
| download | ffmpeg-13aa5757643eb05da27077acdde4a876a6e50d75.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xtea: Add Doxy @file and group
See: 50f52a5498ff02c997d16b8181f32b933ce94b6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmenc.c')
0 files changed, 0 insertions, 0 deletions