[FFmpeg-cvslog] Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'
Michael Niedermayer
git at videolan.org
Fri Nov 21 23:37:43 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 21 23:18:30 2014 +0100| [a82f3de053a7c398418b92ee048cf1e5e83d417d] | committer: Michael Niedermayer
Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
vp9: Use the correct upper bound for seg_id
Conflicts:
libavcodec/vp9.h
libavcodec/vp9block.c
Not merged, the value was correct before as far as i can see
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a82f3de053a7c398418b92ee048cf1e5e83d417d
---
More information about the ffmpeg-cvslog
mailing list