[FFmpeg-cvslog] Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 16:55:16 2013 +0200| [102a1d9239fcfe37a8cee5a691d7533e5eb347fa] | committer: Michael Niedermayer

Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'

* 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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=102a1d9239fcfe37a8cee5a691d7533e5eb347fa
---