diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:55:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 17:03:22 +0200 |
| commit | 102a1d9239fcfe37a8cee5a691d7533e5eb347fa (patch) | |
| tree | 6f1cb56ef5549e7442692f062a12e74457c71a1d /doc | |
| parent | 19769766740bf4932c7920ca61d4df41e0610083 (diff) | |
| parent | b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2 (diff) | |
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@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions