diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:29:30 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:29:30 +0200 |
| commit | b3e5d59537cbd375ca508fe2dfca30bcd2d201d3 (patch) | |
| tree | ccd7716b15df1b2780bb21863b8e3a8e474d563b /libavcodec/j2kenc.c | |
| parent | 90ec89a629b3bd948713c8da2f7f118f4a5620b2 (diff) | |
| parent | 979cb55103fa8e8274806e496901203742c686d1 (diff) | |
| download | ffmpeg-b3e5d59537cbd375ca508fe2dfca30bcd2d201d3.tar.gz | |
Merge commit '979cb55103fa8e8274806e496901203742c686d1'
* commit '979cb55103fa8e8274806e496901203742c686d1':
hevc: Split the sei parsing in 3 functions
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/j2kenc.c')
0 files changed, 0 insertions, 0 deletions