]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daedfa7 6ac52f0)
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)
* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
  dvbsub_parser: Add missing mem.h #include

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/dvbsub_parser.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/dvbsub_parser.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.