Merge commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 May 2016 14:16:38 +0000 (15:16 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 May 2016 14:16:38 +0000 (15:16 +0100)
commit278dcec28db8f309cf202b002966f06b9d275248
tree6858d93582c3bb46ce358961165ae4628b312bf6
parent6b295bccbbf7e19d92fe7850de42885b40fe9f07
parenta6e27f7add2698fdd89911632b570c3d0c3f2aaa
Merge commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa'

* commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
  h264: factor out parsing the reference count into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/h264_parser.c
libavcodec/h264_slice.c