[FFmpeg-devel] [PATCH] lavf: add AV_ to two remaining CODEC_ID_*.

[Hendrik Leppkes]

On Tue, Mar 12, 2013 at 3:57 PM, Nicolas George
<nicolas.george at normalesup.org> wrote:
>
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavformat/mxfdec.c         |    2 +-
>  libavformat/tedcaptionsdec.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> index f7aaa5a..7dfdbfd 100644
> --- a/libavformat/mxfdec.c
> +++ b/libavformat/mxfdec.c
> @@ -1602,7 +1602,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
>              st->codec->extradata = av_mallocz(descriptor->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
>              if (st->codec->extradata)
>                  memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size);
> -        } else if(st->codec->codec_id == CODEC_ID_H264) {
> +        } else if(st->codec->codec_id == AV_CODEC_ID_H264) {
>              ff_generate_avci_extradata(st);
>          }
>          if (st->codec->codec_type != AVMEDIA_TYPE_DATA && (*essence_container_ul)[15] > 0x01) {
> diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c
> index 85bed0a..048ba96 100644
> --- a/libavformat/tedcaptionsdec.c
> +++ b/libavformat/tedcaptionsdec.c
> @@ -295,7 +295,7 @@ static av_cold int tedcaptions_read_header(AVFormatContext *avf)
>      if (!st)
>          return AVERROR(ENOMEM);
>      st->codec->codec_type     = AVMEDIA_TYPE_SUBTITLE;
> -    st->codec->codec_id       = CODEC_ID_TEXT;
> +    st->codec->codec_id       = AV_CODEC_ID_TEXT;
>      avpriv_set_pts_info(st, 64, 1, 1000);
>      st->probe_packets = 0;
>      st->start_time    = 0;
> --
> 1.7.10.4
>

Looks good.
I'll send a patch to disable the old names again, which Michael
enabled briefly during merging to solve the compilation issue.

- Hendrik