Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 10:36:44 +0000 (11:36 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 10:36:44 +0000 (11:36 +0100)
commit64ae08ffec1a07803dc1acdb6d0bcd8e628040c2
tree7b81ce4c89b99c0be0391b840a658efbaaa858a2
parentc84ba07db4abd123b2ad93784e312a24d9341553
parent02cd8bb9cb4381c50f42a9284098cc8a33d397db
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'

* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
  h264: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/h264_parser.c
libavcodec/ppc/h264dsp.c