Michael Niedermayer 4690a63632 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>

2015-07-12 23:44:24 +02:00

17 KiB

Raw Blame History

View Raw