diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 23:31:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 23:44:24 +0200 |
| commit | 4690a636324663be660602ea4d1d80ba4fa29763 (patch) | |
| tree | e2e86aeda6938c596a5ac3362b59910787b6cd79 /ffmpeg_opt.c | |
| parent | 4c42c66935a7bdaded8667fa76dc0945ae66e867 (diff) | |
| parent | d82e1adc2019135a2fc45372e0ed0b5ef107cdd0 (diff) | |
Merge commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0'
* commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0':
hevc: move splitting the packet into NALUs into a separate function
Conflicts:
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_parse.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions