Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 21:15:07 +0000 (18:15 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 21:15:07 +0000 (18:15 -0300)
commit517dd04f6df3103a6f2bc20b43b956d055ad983f
tree68ec6cc818b6075ee1c88b100e502148ac51741f
parentfd4eb56528e1bf6529397051838a28d2a39d8e01
parentbc7f4268514624e1286ea76d27a89a56b4ee18e1
Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'

* commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1':
  h264: drop tests whether the codec id is AV_CODEC_ID_H264

Conflicts:
libavcodec/h264dec.c

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