Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

Browse Source 
Tested to compile with lavc major bump.

Signed-off-by: Mans Rullgard <mans@mansr.com>
oldabi
Anton Khirnov 14 years ago committed by Mans Rullgard
parent 1f56f5ed6d
commit b2ed95ec48
5 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/aacdec.c
  2. 2
      libavcodec/amrwbdec.c
  3. 2
      libavcodec/lagarith.c
  4. 2
      libavformat/ivfenc.c
  5. 12
      libavformat/rtpdec_qt.c

2
libavcodec/aacdec.c
Unescape View File

@ -2363,7 +2363,7 @@ AVCodec ff_aac_decoder = {
*/ */
AVCodec ff_aac_latm_decoder = { AVCodec ff_aac_latm_decoder = {
.name = "aac_latm", .name = "aac_latm",
.type = CODEC_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_AAC_LATM, .id = CODEC_ID_AAC_LATM,
.priv_data_size = sizeof(struct LATMContext), .priv_data_size = sizeof(struct LATMContext),
.init = latm_decode_init, .init = latm_decode_init,

2
libavcodec/amrwbdec.c
Unescape View File

@ -1227,7 +1227,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
AVCodec ff_amrwb_decoder = { AVCodec ff_amrwb_decoder = {
.name = "amrwb", .name = "amrwb",
.type = CODEC_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_AMR_WB, .id = CODEC_ID_AMR_WB,
.priv_data_size = sizeof(AMRWBContext), .priv_data_size = sizeof(AMRWBContext),
.init = amrwb_decode_init, .init = amrwb_decode_init,

2
libavcodec/lagarith.c
Unescape View File

@ -510,7 +510,7 @@ static av_cold int lag_decode_end(AVCodecContext *avctx)
AVCodec ff_lagarith_decoder = { AVCodec ff_lagarith_decoder = {
"lagarith", "lagarith",
CODEC_TYPE_VIDEO, AVMEDIA_TYPE_VIDEO,
CODEC_ID_LAGARITH, CODEC_ID_LAGARITH,
sizeof(LagarithContext), sizeof(LagarithContext),
lag_decode_init, lag_decode_init,

2
libavformat/ivfenc.c
Unescape View File

@ -30,7 +30,7 @@ static int ivf_write_header(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
ctx = s->streams[0]->codec; ctx = s->streams[0]->codec;
if (ctx->codec_type != CODEC_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) { if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != CODEC_ID_VP8) {
av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n"); av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }

12
libavformat/rtpdec_qt.c
Unescape View File

@ -104,9 +104,9 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
url_fseek(&pb, pos + 4, SEEK_SET); url_fseek(&pb, pos + 4, SEEK_SET);
tag = get_le32(&pb); tag = get_le32(&pb);
if ((st->codec->codec_type == CODEC_TYPE_VIDEO && if ((st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
tag != MKTAG('v','i','d','e')) || tag != MKTAG('v','i','d','e')) ||
(st->codec->codec_type == CODEC_TYPE_AUDIO && (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
tag != MKTAG('s','o','u','n'))) tag != MKTAG('s','o','u','n')))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_set_pts_info(st, 32, 1, get_be32(&pb)); av_set_pts_info(st, 32, 1, get_be32(&pb));
@ -248,7 +248,7 @@ RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \
.parse_packet = qt_rtp_parse_packet, \ .parse_packet = qt_rtp_parse_packet, \
}; };
RTP_QT_HANDLER(qt, vid, "X-QT", CODEC_TYPE_VIDEO); RTP_QT_HANDLER(qt, vid, "X-QT", AVMEDIA_TYPE_VIDEO);
RTP_QT_HANDLER(qt, aud, "X-QT", CODEC_TYPE_AUDIO); RTP_QT_HANDLER(qt, aud, "X-QT", AVMEDIA_TYPE_AUDIO);
RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", CODEC_TYPE_VIDEO); RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", AVMEDIA_TYPE_VIDEO);
RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", CODEC_TYPE_AUDIO); RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", AVMEDIA_TYPE_AUDIO);

Write Preview
Loading…
Cancel
Save