[MPlayer-dev-eng] [PATCH] Fix dependencies between muxer and demuxer

[Diego Biurrun]

On Mon, Apr 07, 2008 at 02:49:56PM +0200, Alban Bedel wrote:
> 
> following my previous post, now are fixes for vivodump. They allow to
> use libmpmux without libmpdemux.
> 
> --- libmpdemux/aac_hdr.c	(revision 0)
> +++ libmpdemux/aac_hdr.c	(revision 0)
> @@ -0,0 +1,29 @@
> +
> +#include <stdlib.h>
> +#include <inttypes.h>

Please give new files proper license headers.

> --- libmpdemux/Makefile	(revision 26343)
> +++ libmpdemux/Makefile	(working copy)
> @@ -36,6 +36,7 @@
>                extension.c \
>                mf.c \
> +              aac_hdr.c \
>                mp3_hdr.c \

alphabetical order

>                mpeg_hdr.c \
>                mpeg_packetizer.c \

> Index: libmpdemux/Makefile
> ===================================================================
> --- libmpdemux/Makefile	(revision 26343)
> +++ libmpdemux/Makefile	(working copy)
> @@ -45,6 +45,7 @@
>                video.c \
>                yuv4mpeg.c \
>                yuv4mpeg_ratio.c \
> +              mp_taglists.c \

alphabetical order

> @@ -68,5 +69,6 @@
>  
>  demux_lavf.o: CFLAGS += -I../libavcodec
> +mp_taglists.o: CFLAGS += -I../libavcodec

Merge these two lines.

> --- libmpdemux/mp_taglists.c	(revision 0)
> +++ libmpdemux/mp_taglists.c	(revision 0)
> @@ -0,0 +1,64 @@
> +
> +#include "config.h"

license header please

> +static const AVCodecTag mp_wav_tags[] = {
> +    { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
> +    { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
> +    { CODEC_ID_ADPCM_IMA_WS,      MKTAG('A', 'I', 'W', 'S')},
> +    { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
> +    { CODEC_ID_AMR_NB,            MKTAG('n', 'b',   0,   0)},
> +    { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
> +    { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
> +    { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
> +    { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
> +    { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
> +    { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},
> +    { CODEC_ID_QDM2,              MKTAG('Q', 'D', 'M', '2')},
> +    { CODEC_ID_ROQ_DPCM,          MKTAG('R', 'o', 'Q', 'A')},
> +    { CODEC_ID_SHORTEN,           MKTAG('s', 'h', 'r', 'n')},
> +    { CODEC_ID_SPEEX,             MKTAG('s', 'p', 'x', ' ')},
> +    { CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1')},
> +    { CODEC_ID_WAVPACK,           MKTAG('W', 'V', 'P', 'K')},
> +    { CODEC_ID_WESTWOOD_SND1,     MKTAG('S', 'N', 'D', '1')},
> +    { CODEC_ID_XAN_DPCM,          MKTAG('A', 'x', 'a', 'n')},
> +    { 0, 0 },
> +};

This file could be created with 'svn cp' from demux_lavf.c.

> --- libmpdemux/mp_taglists.h	(revision 0)
> +++ libmpdemux/mp_taglists.h	(revision 0)
> @@ -0,0 +1,10 @@
> +#ifndef MPLAYER_MP_TAGLISTS_H
> +#define MPLAYER_MP_TAGLISTS_H

license header please

Diego