# HG changeset patch # User Nina Engelhardt # Date 1368805805 -7200 # Node ID 6c1433f5a56299b7ea91878cfe8f68daeb519c98 # Parent c8259123d224b57d582495f578b64aac4c74d7dc remove need for end_thread() diff -r c8259123d224 -r 6c1433f5a562 libavcodec/h264_ompss.c --- a/libavcodec/h264_ompss.c Wed May 15 15:26:14 2013 +0200 +++ b/libavcodec/h264_ompss.c Fri May 17 17:50:05 2013 +0200 @@ -58,7 +58,7 @@ decode_nal_units(nc, s, &sbe->gb); - VSs__end_task(); + return; } VSsTaskType parse_taskType = { @@ -94,7 +94,7 @@ if( !s->pps.cabac ){ av_log(AV_LOG_ERROR, "Only cabac encoded streams are supported\n"); - VSs__end_task(); + return; } init_dequant_tables(s, ec); @@ -124,11 +124,11 @@ (void) eos; if( ret < 0 || c->bytestream > c->bytestream_end + 2) { av_log(AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", m->mb_x, m->mb_y, c->bytestream_end - c->bytestream); - VSs__end_task(); + return; } } } - VSs__end_task(); + return; } VSsTaskType decode_slice_entropy_taskType = { @@ -178,7 +178,7 @@ H264Slice *s = &sbe->slice; H264Mb *mbs = sbe->mbs; decode_super_mb_block(d, s, smbc, mbs, m->smb_x, m->smb_y); - VSs__end_task(); + return; } VSsTaskType decode_super_mb_taskType = { @@ -214,7 +214,7 @@ for (int i=line*smbc->smb_height; i< (line+1)*smbc->smb_height && i< d->mb_height; i++) draw_edges(d, s, i); VMS_App__free(args->line); - VSs__end_task(); + return; } VSsTaskType draw_edges_taskType = { .fn = &draw_edges_task, @@ -315,7 +315,7 @@ } } s->release_cnt=0; - VSs__end_task(); + return; } VSsTaskType decode_slice_mb_taskType = { @@ -357,7 +357,7 @@ H264Mb *mbs = sbe->mbs; decode_super_mb_block(d, s, smbc, mbs, m->smb_x, m->smb_y); - VSs__end_task(); + return; } VSsTaskType decode_3dwave_super_mb_taskType = { @@ -407,7 +407,7 @@ get_dpb_entry(h, s); VSs__end_critical(0); - VSs__end_task(); + return; } VSsTaskType init_ref_list_and_get_dpb_taskType = { @@ -537,7 +537,7 @@ release_smbc(h, smbc); - VSs__end_task(); + return; } VSsTaskType release_ref_list_taskType = { @@ -579,7 +579,7 @@ } //print_report(oc->frame_number, oc->video_size, 0, h->verbose); - VSs__end_task(); + return; } VSsTaskType output_taskType = {