diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-17 15:16:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-17 15:16:01 +0200 |
| commit | 7163bbefa26d634eae7bac8f0d891f2bca270eb9 (patch) | |
| tree | 9435643e06f694e96a038fd78381057c94c1aafd /libswscale/utils.c | |
| parent | a64b99503b962c757908e6796fc224aae23732ae (diff) | |
| parent | e1f3847f860a1094a46be4c5f10db8df616c3135 (diff) | |
Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
mace: Make sure that the channel count is set to a valid value
Conflicts:
libavcodec/mace.c
See: 6df1cfa7e4d488051d7b5033c0c69df970db9f82
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions