Merge commit 'e723dce6f8ba1e8260433b6ecfe5a3262f4c7a99'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:35:36 +0000 (21:35 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:35:36 +0000 (21:35 -0300)
commitf073b2da8410eb83eb0c7db6badc5f0bdeeb1f9c
treeff57678b4e6de4f32e58eb9dfe27acaab64a1a79
parent8c0aacf0ec77215a4a46f73ec18d884fa6aa71ca
parente723dce6f8ba1e8260433b6ecfe5a3262f4c7a99
Merge commit 'e723dce6f8ba1e8260433b6ecfe5a3262f4c7a99'

* commit 'e723dce6f8ba1e8260433b6ecfe5a3262f4c7a99':
  dvbsubdec: Use NULL instead of 0 as pointer value

This commit is a noop. The affected code isn't in our tree.

Merged-by: James Almer <jamrial@gmail.com>