[FFmpeg-cvslog] Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
Michael Niedermayer
git at videolan.org
Tue Jan 27 13:21:40 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 13:15:06 2015 +0100| [a7fa1b9aa104491e44a0489e09febe036c70f4f9] | committer: Michael Niedermayer
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
hevc: unref the current frame if frame_start() fails
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7fa1b9aa104491e44a0489e09febe036c70f4f9
---
More information about the ffmpeg-cvslog
mailing list