[FFmpeg-cvslog] Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'
Michael Niedermayer
git at videolan.org
Mon Jul 13 17:11:12 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 13 17:04:13 2015 +0200| [5be07d0206916bf9119e5f4255c528aac1621406] | committer: Michael Niedermayer
Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'
* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
hevc_parser: fix standalone build with the hevc decoder disabled
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5be07d0206916bf9119e5f4255c528aac1621406
---
More information about the ffmpeg-cvslog
mailing list