2 Commits

Author	SHA1	Message	Date
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
Luca Barbato	f51d0f39c0	h264: Split h264 slice decoding from nal decoding	2014-03-23 22:41:12 +01:00