[FFmpeg-cvslog] Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc'
Michael Niedermayer
git at videolan.org
Mon Jul 13 16:58:47 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 13 16:50:06 2015 +0200| [1127b35ff100983dc15d5b0929c98554afed8300] | committer: Michael Niedermayer
Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc'
* commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc':
hevc_ps: make sure failing to decode an SPS always returns an error
Conflicts:
libavcodec/hevc_ps.c
See: 15893adbdb6a7000f59207bcb88def6e7b4812b9
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1127b35ff100983dc15d5b0929c98554afed8300
---
More information about the ffmpeg-cvslog
mailing list