diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 21:54:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 21:54:26 +0100 |
| commit | f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63 (patch) | |
| tree | d47be977ce07848e286869f2c6f35457bd0f0fcb /libavformat/smjpeg.h | |
| parent | 90de28befd88fccb2a4d96d55e1d72eac96c4278 (diff) | |
| parent | ca09effb01e126b0ac74ff3de70a475423ddee82 (diff) | |
| download | ffmpeg-f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63.tar.gz | |
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
ffv1: Drop unnecessary casts and const qualifiers to match function signatures
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpeg.h')
0 files changed, 0 insertions, 0 deletions