diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:34:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:34:45 +0100 |
| commit | 76c63bc5d8567817c229adc6a6fcd9cbd902f0d8 (patch) | |
| tree | 7c7bf24456e1450163b97d8ce94cf7fd95073cce /libavcodec/jpegls.h | |
| parent | 59725592a97fc65a917001bc248567666dfded5a (diff) | |
| parent | 3867f3718ba82ff11d3e24c6d84beb520d0b174f (diff) | |
| download | ffmpeg-76c63bc5d8567817c229adc6a6fcd9cbd902f0d8.tar.gz | |
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
lavf: remove a pointless check
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpegls.h')
0 files changed, 0 insertions, 0 deletions