[FFmpeg-cvslog] Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:52:03 2016 +0200| [bf7d0162191791abe445aadd4f0eef2667cd4cb0] | committer: Clément Bœsch

Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'

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

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf7d0162191791abe445aadd4f0eef2667cd4cb0
---

 libavcodec/dvbsub_parser.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index ccb63c3..e77b965 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
 
 #include "avcodec.h"
 #include "internal.h"


======================================================================