Mercurial > mplayer.hg

comparison stream/tvi_v4l2.c @ 32090:535ebcd085e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move TV input free_handle static function to tv.c and make it non-static. There is no need to pointlessly duplicate the function in the binary.
author diego
date Sat, 11 Sep 2010 23:53:15 +0000
parents 64ba1daa147a
children 2802b8095bf7
comparison
equal deleted inserted replaced
32089:7f6ac03eb2ce 32090:535ebcd085e4
1075 } 1075 }
1076 PRIV->video_fd = -1; 1076 PRIV->video_fd = -1;
1077 1077
1078 PRIV->video_dev = strdup(tv_param->device? tv_param->device: "/dev/video0"); 1078 PRIV->video_dev = strdup(tv_param->device? tv_param->device: "/dev/video0");
1079 if (!PRIV->video_dev) { 1079 if (!PRIV->video_dev) {
1080 free_handle(tvi_handle); 1080 tv_free_handle(tvi_handle);
1081 return NULL; 1081 return NULL;
1082 } 1082 }
1083 1083
1084 if (tv_param->adevice) { 1084 if (tv_param->adevice) {
1085 PRIV->audio_dev = strdup(tv_param->adevice); 1085 PRIV->audio_dev = strdup(tv_param->adevice);
1086 if (!PRIV->audio_dev) { 1086 if (!PRIV->audio_dev) {
1087 free(PRIV->video_dev); 1087 free(PRIV->video_dev);
1088 free_handle(tvi_handle); 1088 tv_free_handle(tvi_handle);
1089 return NULL; 1089 return NULL;
1090 } 1090 }
1091 } 1091 }
1092 1092
1093 PRIV->tv_param=tv_param; 1093 PRIV->tv_param=tv_param;