diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 10:57:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 10:57:10 +0100 |
| commit | 0bdc5db520ba9126776dd12b6734150ebcc7c559 (patch) | |
| tree | 006c75694466587e9fb5fc48486f3ac26339875b /libavcodec/jpeglsdec.h | |
| parent | 2b14593148e0aef6f3ca76dcc3f9f2133a066b3d (diff) | |
| parent | 95a449d3ce8e15522df47a80a8a4593ea5c2b1bb (diff) | |
| download | ffmpeg-0bdc5db520ba9126776dd12b6734150ebcc7c559.tar.gz | |
Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
movenc: Remove an outdated comment
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
0 files changed, 0 insertions, 0 deletions