#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_vout.h>
#include <png.h>
/*****************************************************************************
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('p','n','g',' ') &&
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_PNG &&
p_dec->fmt_in.i_codec != VLC_FOURCC('M','P','N','G') )
{
return VLC_EGENERIC;
/* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES;
- p_dec->fmt_out.i_codec = VLC_FOURCC('R','G','B','A');
+ p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
/* Set callbacks */
p_dec->pf_decode_video = DecodeBlock;
if( p_sys->b_error ) goto error;
/* Set output properties */
- p_dec->fmt_out.i_codec = VLC_FOURCC('R','G','B','A');
+ p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
p_dec->fmt_out.video.i_width = i_width;
p_dec->fmt_out.video.i_height = i_height;
p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * i_width / i_height;
}
else if( !(i_color_type & PNG_COLOR_MASK_ALPHA) )
{
- p_dec->fmt_out.i_codec = VLC_FOURCC('R','V','2','4');
+ p_dec->fmt_out.i_codec = VLC_CODEC_RGB24;
}
/* Get a new picture */