Commit ece37431 authored by Gerion Entrup's avatar Gerion Entrup
Browse files

fix whitespace errors

parent 52d71a03
......@@ -5235,7 +5235,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
h_base->target_voidx = 0;
h_base->target_voidx_count = 1;
}
if(h_base->target_voidx_count == 1){
*data_size = out_size[h_base->target_voidx];
*pict = out[h_base->target_voidx];
......
......@@ -710,7 +710,7 @@ typedef struct H264Context {
// sub_sps_buffer
SPS *sub_sps_buffers[MAX_SPS_COUNT]; /* Buffer for the subset sequence parameter sets used for non base views */
// just for easier handling of mvc (not in the standard)
u_int8_t is_mvc; ///< signals, if MVC is available or not (NAL unit 14 or 20 received)
int base_view_id; ///< view id of the base view, not the vOIdx of the base view!
......@@ -718,7 +718,7 @@ typedef struct H264Context {
int idr_frame_num;
int voidx; ///< view order index (vOIdx) of this context.
int voidx_list[MAX_VIEW_COUNT]; ///< list of vOIdx indexed by view_id.
struct H264Context* mvc_context[MAX_VIEW_COUNT];///< contains pointers to each view context indexed by vOIdx
......@@ -889,7 +889,7 @@ void ff_h264_filter_mb(H264Context *h, int mb_x, int mb_y,
// generated headers for using static inline functions
int pred_weight_table(H264Context *h);
// moved to header to have access to it in H264_parser.c
// moved to header to have access to it in H264_parser.c
static const AVOption h264_options[] = { { "is_avc", "is avc", offsetof(H264Context, is_avc),
FF_OPT_TYPE_INT, { .dbl = 0 }, 0, 1, 0 }, { "nal_length_size", "nal_length_size",
offsetof(H264Context, nal_length_size), FF_OPT_TYPE_INT, { .dbl = 0 }, 0, 4, 0 },
......
......@@ -110,7 +110,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){
int ref1sidx = (ref1->f.reference&1)^1;
// EDIT JB
if(ref1->inter_ref){
h->direct_spatial_mv_pred = 1;
h->direct_spatial_mv_pred = 1;
}
// END EDIT
......@@ -160,12 +160,12 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y
//FIXME it can be safe to access mb stuff
//even if pixels aren't deblocked yet
if(ref->view_id != h->view_id){
ff_h264_thread_await_picture(h, ref);
}else {
ff_h264_thread_await_progress(h, ref,
FFMIN(16 * mb_y >> ref_field_picture, ref_height - 1),
ref_field_picture && ref_field);
}
ff_h264_thread_await_picture(h, ref);
}else {
ff_h264_thread_await_progress(h, ref,
FFMIN(16 * mb_y >> ref_field_picture, ref_height - 1),
ref_field_picture && ref_field);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment