On 26/03/13 21:01, Diego Biurrun wrote:
> ---
>
> This leaves ff_mpeg1_decode_block_intra() in mpeg12dec.c, as it is a
> wrapper around an inline function mpeg1_decode_block_intra() and
> moving that function would require placing it in a header file or
> dropping the inline keyword. Suggestions welcome.
>
> In any case, this already shaves ~2500 loc from all builds that use only
> the mpeg12 common code.
>
> libavcodec/Makefile | 8 +-
> libavcodec/mpeg12.c | 2535
> +---------------------------------
> libavcodec/mpeg12.h | 11 +
> libavcodec/{mpeg12.c => mpeg12dec.c} | 195 +--
> 4 files changed, 83 insertions(+), 2666 deletions(-)
> copy libavcodec/{mpeg12.c => mpeg12dec.c} (93%)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 32a3a7b..86f1c4b 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -157,8 +157,8 @@ OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o
> eaidct.o mpeg12.o \
> mpeg12data.o
> OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o
> OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o
> -OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o \
> - mpeg12data.o
> +OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12dec.o \
> + mpeg12.o mpeg12data.o
> OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
> OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o
> OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
> @@ -240,9 +240,9 @@ OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) +=
> mpegaudiodec_float.o mpeg4audio.o
> OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o
> OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o
> OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o
> -OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o
> +OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
> OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
> -OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o
> +OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
> OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
> OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o
> OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \
the mpeg12dec.o mpeg12.o mpeg12data.o order looks off.
The rest is ok assuming the code had been copy-pasted correctly.
lu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
