Michael Niedermayer ffd77f94a2 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  h264: Split h264 slice decoding from nal decoding

Conflicts:
	libavcodec/Makefile
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-24 01:33:02 +01:00

35 KiB

Raw Blame History

View Raw