diff options
| author | Oded Shimon <ods15@ods15.dyndns.org> | 2007-03-10 18:39:58 +0000 |
|---|---|---|
| committer | Oded Shimon <ods15@ods15.dyndns.org> | 2007-03-10 18:39:58 +0000 |
| commit | 1017fafb202b0422f8b7ac0404d00ed6d1e8dba5 (patch) | |
| tree | 783a8a85afb8a40342d36cb43a60f04a53d631b9 | |
| parent | 0020596f9234784be9a0de9d8f1dde8faac6a706 (diff) | |
remove usage of deprecated functions in libnut.c (codec_get_id/tag)
Originally committed as revision 8316 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/libnut.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/libnut.c b/libavformat/libnut.c index 6f0142113e..0f7b879a94 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -83,8 +83,8 @@ static int nut_write_header(AVFormatContext * avf) { else fourcc = codec_get_tag(nut_tags, codec->codec_id); if (!fourcc) { - if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = codec_get_bmp_tag(codec->codec_id); - if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_wav_tag(codec->codec_id); + if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = codec_get_tag(codec_bmp_tags, codec->codec_id); + if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_tag(codec_wav_tags, codec->codec_id); } s[i].fourcc_len = 4; @@ -235,14 +235,14 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { switch(s[i].type) { case NUT_AUDIO_CLASS: st->codec->codec_type = CODEC_TYPE_AUDIO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_wav_id(st->codec->codec_tag); + if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_id(codec_wav_tags, st->codec->codec_tag); st->codec->channels = s[i].channel_count; st->codec->sample_rate = s[i].samplerate_num / s[i].samplerate_denom; break; case NUT_VIDEO_CLASS: st->codec->codec_type = CODEC_TYPE_VIDEO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_bmp_id(st->codec->codec_tag); + if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_id(codec_bmp_tags, st->codec->codec_tag); st->codec->width = s[i].width; st->codec->height = s[i].height; |