diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:18:40 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:18:40 +0200 |
| commit | 2e290d61147a084de86777c26c95908ce62e0033 (patch) | |
| tree | 7d9e0d74a976a1dba805e5be25a38097521c3aa7 /libavcodec/audioconvert.h | |
| parent | 582d98aed97a1295f19e628bbc7e05a6e27569b8 (diff) | |
| parent | 2cd841c0776535be56e4db67485fdd9509c9b9f4 (diff) | |
| download | ffmpeg-2e290d61147a084de86777c26c95908ce62e0033.tar.gz | |
Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'
* commit '2cd841c0776535be56e4db67485fdd9509c9b9f4':
hevc: Use a proper enum for the SEI values
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/audioconvert.h')
0 files changed, 0 insertions, 0 deletions