diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-23 19:25:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-23 19:32:24 +0100 |
| commit | 73fce258b774d0480f2d2dd7ec81fa1ec1b27812 (patch) | |
| tree | e37f560a2113ba8f7338450c95b83ab310b7bb94 /libavfilter/vf_mp.c | |
| parent | da8ef5ac2f1b14f4fe34db72af5d5f8b3c8e2ff9 (diff) | |
vf_mp: Set pseudo pal
Fixes ticket2140
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mp.c')
| -rw-r--r-- | libavfilter/vf_mp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 814b21ac9a..8edb20fb8f 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -207,6 +207,12 @@ zrmjpeg CpuCaps ff_gCpuCaps; //FIXME initialize this so optims work +enum AVPixelFormat ff_mp2ff_pix_fmt(int mp){ + int i; + for(i=0; conversion_map[i].fmt && mp != conversion_map[i].fmt; i++) + ; + return mp == conversion_map[i].fmt ? conversion_map[i].pix_fmt : AV_PIX_FMT_NONE; +} static void ff_sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam) { |