Commit 674eeb5f authored by Aurelien Jacobs's avatar Aurelien Jacobs

cosmetics: indentation

Originally committed as revision 9582 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent eb75a698
...@@ -4109,8 +4109,8 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) ...@@ -4109,8 +4109,8 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
c->h264_loop_filter_strength= NULL; c->h264_loop_filter_strength= NULL;
if (ENABLE_ANY_H263) { if (ENABLE_ANY_H263) {
c->h263_h_loop_filter= h263_h_loop_filter_c; c->h263_h_loop_filter= h263_h_loop_filter_c;
c->h263_v_loop_filter= h263_v_loop_filter_c; c->h263_v_loop_filter= h263_v_loop_filter_c;
} }
c->h261_loop_filter= h261_loop_filter_c; c->h261_loop_filter= h261_loop_filter_c;
......
...@@ -3349,8 +3349,8 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) ...@@ -3349,8 +3349,8 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
if (ENABLE_ANY_H263) { if (ENABLE_ANY_H263) {
c->h263_v_loop_filter= h263_v_loop_filter_mmx; c->h263_v_loop_filter= h263_v_loop_filter_mmx;
c->h263_h_loop_filter= h263_h_loop_filter_mmx; c->h263_h_loop_filter= h263_h_loop_filter_mmx;
} }
c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx; c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx;
c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx; c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx;
......
...@@ -1701,7 +1701,8 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x, ...@@ -1701,7 +1701,8 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
break; break;
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
if (ENABLE_MPEG4_ENCODER) if (ENABLE_MPEG4_ENCODER)
mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; mpeg4_encode_mb(s, s->block, motion_x, motion_y);
break;
case CODEC_ID_MSMPEG4V2: case CODEC_ID_MSMPEG4V2:
case CODEC_ID_MSMPEG4V3: case CODEC_ID_MSMPEG4V3:
case CODEC_ID_WMV1: case CODEC_ID_WMV1:
...@@ -1723,7 +1724,8 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x, ...@@ -1723,7 +1724,8 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
case CODEC_ID_RV20: case CODEC_ID_RV20:
if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER ||
ENABLE_FLV_ENCODER || ENABLE_RV10_ENCODER || ENABLE_RV20_ENCODER) ENABLE_FLV_ENCODER || ENABLE_RV10_ENCODER || ENABLE_RV20_ENCODER)
h263_encode_mb(s, s->block, motion_x, motion_y); break; h263_encode_mb(s, s->block, motion_x, motion_y);
break;
case CODEC_ID_MJPEG: case CODEC_ID_MJPEG:
if (ENABLE_MJPEG_ENCODER) if (ENABLE_MJPEG_ENCODER)
ff_mjpeg_encode_mb(s, s->block); ff_mjpeg_encode_mb(s, s->block);
...@@ -2031,7 +2033,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -2031,7 +2033,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
case CODEC_ID_H263P: case CODEC_ID_H263P:
case CODEC_ID_FLV1: case CODEC_ID_FLV1:
if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || ENABLE_FLV_ENCODER) if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || ENABLE_FLV_ENCODER)
s->gob_index = ff_h263_get_gob_height(s); s->gob_index = ff_h263_get_gob_height(s);
break; break;
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
if(ENABLE_MPEG4_ENCODER && s->partitioned_frame) if(ENABLE_MPEG4_ENCODER && s->partitioned_frame)
...@@ -2135,8 +2137,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -2135,8 +2137,8 @@ static int encode_thread(AVCodecContext *c, void *arg){
switch(s->codec_id){ switch(s->codec_id){
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
if (ENABLE_MPEG4_ENCODER) { if (ENABLE_MPEG4_ENCODER) {
ff_mpeg4_encode_video_packet_header(s); ff_mpeg4_encode_video_packet_header(s);
ff_mpeg4_clean_buffers(s); ff_mpeg4_clean_buffers(s);
} }
break; break;
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
...@@ -2149,7 +2151,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -2149,7 +2151,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
case CODEC_ID_H263: case CODEC_ID_H263:
case CODEC_ID_H263P: case CODEC_ID_H263P:
if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER) if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER)
h263_encode_gob_header(s, mb_y); h263_encode_gob_header(s, mb_y);
break; break;
} }
...@@ -2482,18 +2484,18 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -2482,18 +2484,18 @@ static int encode_thread(AVCodecContext *c, void *arg){
break; break;
case CANDIDATE_MB_TYPE_DIRECT: case CANDIDATE_MB_TYPE_DIRECT:
if (ENABLE_MPEG4_ENCODER) { if (ENABLE_MPEG4_ENCODER) {
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mv_dir = MV_DIR_FORWARD|MV_DIR_BACKWARD|MV_DIRECT;
s->mb_intra= 0; s->mb_intra= 0;
motion_x=s->b_direct_mv_table[xy][0]; motion_x=s->b_direct_mv_table[xy][0];
motion_y=s->b_direct_mv_table[xy][1]; motion_y=s->b_direct_mv_table[xy][1];
ff_mpeg4_set_direct_mv(s, motion_x, motion_y); ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
} }
break; break;
case CANDIDATE_MB_TYPE_DIRECT0: case CANDIDATE_MB_TYPE_DIRECT0:
if (ENABLE_MPEG4_ENCODER) { if (ENABLE_MPEG4_ENCODER) {
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mv_dir = MV_DIR_FORWARD|MV_DIR_BACKWARD|MV_DIRECT;
s->mb_intra= 0; s->mb_intra= 0;
ff_mpeg4_set_direct_mv(s, 0, 0); ff_mpeg4_set_direct_mv(s, 0, 0);
} }
break; break;
case CANDIDATE_MB_TYPE_BIDIR: case CANDIDATE_MB_TYPE_BIDIR:
...@@ -2669,13 +2671,13 @@ static int estimate_qp(MpegEncContext *s, int dry_run){ ...@@ -2669,13 +2671,13 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
switch(s->codec_id){ switch(s->codec_id){
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
if (ENABLE_MPEG4_ENCODER) if (ENABLE_MPEG4_ENCODER)
ff_clean_mpeg4_qscales(s); ff_clean_mpeg4_qscales(s);
break; break;
case CODEC_ID_H263: case CODEC_ID_H263:
case CODEC_ID_H263P: case CODEC_ID_H263P:
case CODEC_ID_FLV1: case CODEC_ID_FLV1:
if (ENABLE_H263_ENCODER||ENABLE_H263P_ENCODER||ENABLE_FLV_ENCODER) if (ENABLE_H263_ENCODER||ENABLE_H263P_ENCODER||ENABLE_FLV_ENCODER)
ff_clean_h263_qscales(s); ff_clean_h263_qscales(s);
break; break;
} }
......
Markdown is supported
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