[FFmpeg-cvslog] Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'
Michael Niedermayer
git at videolan.org
Sun Jul 12 23:03:36 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 22:55:47 2015 +0200| [4c42c66935a7bdaded8667fa76dc0945ae66e867] | committer: Michael Niedermayer
Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'
* commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751':
hevc: eliminate the second call to hls_nal_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c42c66935a7bdaded8667fa76dc0945ae66e867
---
More information about the ffmpeg-cvslog
mailing list