diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 22:55:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 22:55:47 +0200 |
| commit | 4c42c66935a7bdaded8667fa76dc0945ae66e867 (patch) | |
| tree | 34fe29a6bbbbd099f728a5c082f124fa8cf5d053 /libavcodec/avuienc.c | |
| parent | 760304e4c3184d65cf90a017ea75ed40c3b823ea (diff) | |
| parent | ae05b4865514fd71b5e9431e93aa0d03d7ba7751 (diff) | |
| download | ffmpeg-4c42c66935a7bdaded8667fa76dc0945ae66e867.tar.gz | |
Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'
* commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751':
hevc: eliminate the second call to hls_nal_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/avuienc.c')
0 files changed, 0 insertions, 0 deletions