diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 17:59:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 17:59:47 +0100 |
| commit | 8983dea426e34ced61d518f440be21d0f49ddb6d (patch) | |
| tree | 150f3930000c99da4432f1ce70042385068becd5 /libavcodec/jpeg2000dec.c | |
| parent | 2c6e693c975465691ced790ec52ef65588410117 (diff) | |
| parent | c673fc919c374c60b1e6d80d8822712eadf67f16 (diff) | |
| download | ffmpeg-8983dea426e34ced61d518f440be21d0f49ddb6d.tar.gz | |
Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'
* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
hevc_sei: drop unused parameter
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
0 files changed, 0 insertions, 0 deletions