* commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2': ffv1: Make sure at least one slice context is initialized Conflicts: libavcodec/ffv1.c This condition is not possible in ffmpegs ffv1 code and already checked for by assert() for the case that some future changes make it possible. Thus merge just for meta-data
Unified · Split