diff options
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 29 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegvideo.c | 8 |
2 files changed, 14 insertions, 23 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 7420eef4c..d7bbd663e 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -568,11 +568,12 @@ diff -u -r1.31 mpegvideo.c #ifdef CONFIG_ENCODERS #ifdef CONFIG_RISKY -@@ -1438,7 +1440,9 @@ +@@ -1437,8 +1439,10 @@ + if (s->out_format == FMT_MJPEG) mjpeg_picture_trailer(s); - if(s->flags&CODEC_FLAG_PASS1) +#ifdef CONFIG_ENCODERS_FULL + if(s->flags&CODEC_FLAG_PASS1) ff_write_pass1_stats(s); +#endif @@ -594,27 +595,19 @@ diff -u -r1.31 mpegvideo.c }else /* if(s->pict_type == I_TYPE) */{ /* I-Frame */ //FIXME do we need to zero them? -@@ -3087,12 +3093,15 @@ +@@ -3085,6 +3091,7 @@ + //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); + } ++#ifdef CONFIG_ENCODERS_FULL if(!s->umvplus){ if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { -+#ifdef CONFIG_ENCODERS_FULL s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER); - - ff_fix_long_p_mvs(s); -+#endif - } - - if(s->pict_type==B_TYPE){ -+#ifdef CONFIG_ENCODERS_FULL - int a, b; - - a = ff_get_best_fcode(s, s->b_forw_mv_table, MB_TYPE_FORWARD); -@@ -3107,6 +3116,7 @@ - ff_fix_long_b_mvs(s, s->b_back_mv_table, s->b_code, MB_TYPE_BACKWARD); - ff_fix_long_b_mvs(s, s->b_bidir_forw_mv_table, s->f_code, MB_TYPE_BIDIR); +@@ -3109,6 +3116,7 @@ ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR); -+#endif } } ++#endif + if (s->fixed_qscale) + s->frame_qscale = s->current_picture.quality; diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index d2f3c8e90..46d29c8db 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/libavcodec/mpegvideo.c @@ -1439,8 +1439,8 @@ int MPV_encode_picture(AVCodecContext *avctx, if (s->out_format == FMT_MJPEG) mjpeg_picture_trailer(s); - if(s->flags&CODEC_FLAG_PASS1) #ifdef CONFIG_ENCODERS_FULL + if(s->flags&CODEC_FLAG_PASS1) ff_write_pass1_stats(s); #endif @@ -3091,17 +3091,15 @@ static void encode_picture(MpegEncContext *s, int picture_number) //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); } +#ifdef CONFIG_ENCODERS_FULL if(!s->umvplus){ if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { -#ifdef CONFIG_ENCODERS_FULL s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER); ff_fix_long_p_mvs(s); -#endif } if(s->pict_type==B_TYPE){ -#ifdef CONFIG_ENCODERS_FULL int a, b; a = ff_get_best_fcode(s, s->b_forw_mv_table, MB_TYPE_FORWARD); @@ -3116,9 +3114,9 @@ static void encode_picture(MpegEncContext *s, int picture_number) ff_fix_long_b_mvs(s, s->b_back_mv_table, s->b_code, MB_TYPE_BACKWARD); ff_fix_long_b_mvs(s, s->b_bidir_forw_mv_table, s->f_code, MB_TYPE_BIDIR); ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR); -#endif } } +#endif if (s->fixed_qscale) s->frame_qscale = s->current_picture.quality; |