[FFmpeg-cvslog] Merge commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0'
Michael Niedermayer
git at videolan.org
Sun Jul 12 23:45:37 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 23:31:12 2015 +0200| [4690a636324663be660602ea4d1d80ba4fa29763] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4690a636324663be660602ea4d1d80ba4fa29763
---
More information about the ffmpeg-cvslog
mailing list