Merge commit 'ae05b486'
* commit 'ae05b486': hevc: eliminate the second call to hls_nal_unit() Conflicts: libavcodec/hevc.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment
* commit 'ae05b486': hevc: eliminate the second call to hls_nal_unit() Conflicts: libavcodec/hevc.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>