Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:52:03 +0000 (11:52 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:52:03 +0000 (11:52 +0200)
commitbf7d0162191791abe445aadd4f0eef2667cd4cb0
treec55af714dcc6e67c7e2f9077ccc6fe27c8564f87
parentdaedfa72541cd14b94e07a88d057af605c1f8202
parent6ac52f05a6fcadb84972c9557b28c67a416f866b
Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'

* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
  dvbsub_parser: Add missing mem.h #include

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/dvbsub_parser.c