Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:03:15 +0000 (13:03 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:03:15 +0000 (13:03 -0300)
commit7c8bf2dc2ba02312e7bee8f7df7994c3d8587407
tree25d4a7cbe1877561040b95bdf99d5fd6b7d95eb3
parent9ee1f033656374a9f7c9bddcfd85739614580d62
parentb24dafe10572254ff0decc18b0d7c3d3707d5a29
Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29'

* commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29':
  lavc: drop unnecessary h264dec.h includes

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/h264_parser.c
libavcodec/qsvenc_h264.c