[FFmpeg-cvslog] Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'
Michael Niedermayer
git at videolan.org
Tue Jan 21 15:10:05 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 15:03:10 2014 +0100| [42a29015e1bd5ae6d8c5d379ce4294193288220f] | committer: Michael Niedermayer
Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'
* commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f':
hevc: check that VPS referenced from SPS exists
Conflicts:
libavcodec/hevc_ps.c
See: d66bab0a69ac1860e78dd951ad8db1a507e75642
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42a29015e1bd5ae6d8c5d379ce4294193288220f
---
More information about the ffmpeg-cvslog
mailing list