Commit f506ae19 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd2438969'

* commit 'd2438969':
  ffv1: fix calculating slice dimensions for version 2

Conflicts:
	libavcodec/ffv1dec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0cfbfaaa d2438969
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment