diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 18:06:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 18:16:35 +0100 |
| commit | 58f70f17017ec586a50f1fea4a744cbd11f74796 (patch) | |
| tree | 7d9f679b56f106a66db64e5b070dea304adf5977 /libavcodec/pnm_parser.c | |
| parent | 3f5f955c5366de1f0dc643d9631b6cc19ba008cd (diff) | |
| parent | df7aba52b51007db50410abe15fe28391abd8757 (diff) | |
| download | ffmpeg-58f70f17017ec586a50f1fea4a744cbd11f74796.tar.gz | |
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'
* commit 'df7aba52b51007db50410abe15fe28391abd8757':
frame: cosmetics, reindent
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions