[FFmpeg-cvslog] Merge commit '9b60d9197970658e91daf4b586397f450de9af69'
Michael Niedermayer
git at videolan.org
Thu Jun 26 20:08:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 19:56:42 2014 +0200| [acc7cf70dc09ec3e425f7c4fa5e0be427b3f0790] | committer: Michael Niedermayer
Merge commit '9b60d9197970658e91daf4b586397f450de9af69'
* commit '9b60d9197970658e91daf4b586397f450de9af69':
hevc: Allow out of bound values for num_reorder_pics
Conflicts:
libavcodec/hevc_ps.c
See: bc21260e643c2249e38f7485bceada1d4bbb2b9a
See: ab296c7a9fe590860dc95ba97e9cbb9dde798f20
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acc7cf70dc09ec3e425f7c4fa5e0be427b3f0790
---
More information about the ffmpeg-cvslog
mailing list