Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 00:24:55 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 00:33:02 +0000 (01:33 +0100)
commitffd77f94a26be22b8ead3178ceec3ed39e68abc5
tree0e7982c66986de2d8aa41102610a87866e042bec
parent0626211b561f299971a96b7bd1ee6f8a6d6735c8
parentf51d0f39c0fb3470d6b186974109428da91f1d1b
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>
libavcodec/Makefile
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c