ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a82f3de053a7c398418b92ee048cf1e5e83d417d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
