forked from enlightenment/efl
Add return values.
Formatting. Right macro. SVN revision: 16438
This commit is contained in:
parent
5fc8d291e1
commit
1f0a680d7f
|
@ -141,7 +141,7 @@ emotion_object_init(Evas_Object *obj)
|
|||
{
|
||||
Smart_Data *sd;
|
||||
|
||||
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
||||
E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
|
||||
|
||||
if (sd->file) free(sd->file);
|
||||
sd->file = NULL;
|
||||
|
@ -247,7 +247,6 @@ void
|
|||
emotion_object_position_set(Evas_Object *obj, double sec)
|
||||
{
|
||||
Smart_Data *sd;
|
||||
int frame;
|
||||
|
||||
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
|
||||
if (!sd->module) return;
|
||||
|
|
|
@ -67,7 +67,7 @@ em_init(Evas_Object *obj, void **emotion_video)
|
|||
int fds[2];
|
||||
|
||||
if (!emotion_video)
|
||||
return;
|
||||
return 0;
|
||||
|
||||
ev = calloc(1, sizeof(Emotion_Xine_Video));
|
||||
if (!ev) return 0;
|
||||
|
@ -296,6 +296,7 @@ em_shutdown(void *video)
|
|||
close(ev->fd_ev_read);
|
||||
xine_exit(ev->decoder);
|
||||
free(ev);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static unsigned char
|
||||
|
@ -1015,6 +1016,7 @@ em_eject(void *ef)
|
|||
|
||||
ev = (Emotion_Xine_Video *)ef;
|
||||
xine_eject(ev->stream);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const char *
|
||||
|
|
|
@ -377,7 +377,7 @@ _emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint3
|
|||
fr->frame.y = fr->vo_frame.base[0];
|
||||
fr->frame.u = fr->vo_frame.base[1];
|
||||
fr->frame.v = fr->vo_frame.base[2];
|
||||
fr->frame.bgra_data = NULL;
|
||||
fr->frame.bgra_data = NULL;
|
||||
fr->frame.y_stride = fr->vo_frame.pitches[0];
|
||||
fr->frame.u_stride = fr->vo_frame.pitches[1];
|
||||
fr->frame.v_stride = fr->vo_frame.pitches[2];
|
||||
|
@ -386,9 +386,7 @@ _emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint3
|
|||
break;
|
||||
case XINE_IMGFMT_YUY2:
|
||||
{
|
||||
int y_size, uv_size;
|
||||
|
||||
fr->frame.format = EMOTION_BGRA;
|
||||
fr->frame.format = EMOTION_BGRA;
|
||||
fr->vo_frame.pitches[0] = 8 * ((width + 3) / 4);
|
||||
fr->vo_frame.pitches[1] = 0;
|
||||
fr->vo_frame.pitches[2] = 0;
|
||||
|
|
Loading…
Reference in New Issue