[FFmpeg-cvslog] Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'
Michael Niedermayer
git at videolan.org
Thu Jul 23 18:44:24 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 23 18:01:49 2015 +0200| [cb59d29fd6b9472cd6aa29370208e59b63fe3678] | committer: Michael Niedermayer
Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'
* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
hap: Name enums, remove unused struct member
Conflicts:
libavcodec/hap.h
See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb59d29fd6b9472cd6aa29370208e59b63fe3678
---
More information about the ffmpeg-cvslog
mailing list