eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-15 04:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
niels
2013-12-30 21:35:31 +01:00
parent 138aaddc5b
commit f995c5690a
13 changed files with 128 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
veejay-current/veejay-server/libstream/v4l2utils.c
View File

@@ -1171,13 +1171,15 @@ static int v4l2_pull_frame_intern( v4l2info *v )
if(!v->is_jpeg)
v4l2_set_output_pointers( v,src );
#ifdef HAVE_JPEG
if( v->is_jpeg == 1 ) {
length = decode_jpeg_raw( src, n, 0,0, v->info->width,v->info->height,v->info->data[0],v->info->data[1],v->info->data[2] );
if( length == 0 ) { //@ success
length = 1;
}
} else if( v->is_jpeg == 2 ) {
} else
#endif
if( v->is_jpeg == 2 ) {
AVPacket pkt;
memset( &pkt, 0, sizeof(AVPacket));
pkt.data = src;
@@ -1282,13 +1284,15 @@ int v4l2_pull_frame(void *vv,VJFrame *dst)
if(!v->is_jpeg)
v4l2_set_output_pointers( v,src );
#ifdef HAVE_JPEG
if( v->is_jpeg == 1 ) {
length = decode_jpeg_raw( src, n, 0,0, v->info->width,v->info->height,v->info->data[0],v->info->data[1],v->info->data[2] );
if( length == 0 ) { //@ success
length = 1;
}
} else if( v->is_jpeg == 2 ) {
} else
#endif
if( v->is_jpeg == 2 ) {
AVPacket pkt;
memset( &pkt, 0, sizeof(AVPacket));
pkt.data = src;