diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-01-31 10:50:31 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-31 10:50:31 +0400 |
commit | f7fe41a04f962707a99597d2ea49d73ca90b23a0 (patch) | |
tree | 7f006be3b4b527e1cbe26e69db18d4c02c5642d7 /libavformat | |
parent | 9a463917d30147a9728a7b19b03c217527e09046 (diff) |
lavf: rename AVInputFormat.value to raw_codec_id.
It's only used by raw demuxers for storing the codec id.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/aacdec.c | 4 | ||||
-rw-r--r-- | libavformat/ac3dec.c | 4 | ||||
-rw-r--r-- | libavformat/adxdec.c | 4 | ||||
-rw-r--r-- | libavformat/avformat.h | 4 | ||||
-rw-r--r-- | libavformat/dtsdec.c | 2 | ||||
-rw-r--r-- | libavformat/flacdec.c | 2 | ||||
-rw-r--r-- | libavformat/gsmdec.c | 4 | ||||
-rw-r--r-- | libavformat/ingenientdec.c | 2 | ||||
-rw-r--r-- | libavformat/pcmdec.c | 2 | ||||
-rw-r--r-- | libavformat/rawdec.c | 16 | ||||
-rw-r--r-- | libavformat/rawdec.h | 2 | ||||
-rw-r--r-- | libavformat/rawvideodec.c | 2 |
12 files changed, 24 insertions, 24 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index df94d15831..992376ed38 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -70,7 +70,7 @@ static int adts_aac_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = s->iformat->value; + st->codec->codec_id = s->iformat->raw_codec_id; st->need_parsing = AVSTREAM_PARSE_FULL; ff_id3v1_read(s); @@ -89,5 +89,5 @@ AVInputFormat ff_aac_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "aac", - .value = CODEC_ID_AAC, + .raw_codec_id = CODEC_ID_AAC, }; diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index ca6aee3685..4078b1b6bc 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -78,7 +78,7 @@ AVInputFormat ff_ac3_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "ac3", - .value = CODEC_ID_AC3, + .raw_codec_id = CODEC_ID_AC3, }; #endif @@ -96,6 +96,6 @@ AVInputFormat ff_eac3_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "eac3", - .value = CODEC_ID_EAC3, + .raw_codec_id = CODEC_ID_EAC3, }; #endif diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c index 243160940c..305c67431b 100644 --- a/libavformat/adxdec.c +++ b/libavformat/adxdec.c @@ -94,7 +94,7 @@ static int adx_read_header(AVFormatContext *s) return ret; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = s->iformat->value; + st->codec->codec_id = s->iformat->raw_codec_id; avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, avctx->sample_rate); @@ -108,6 +108,6 @@ AVInputFormat ff_adx_demuxer = { .read_header = adx_read_header, .read_packet = adx_read_packet, .extensions = "adx", - .value = CODEC_ID_ADPCM_ADX, + .raw_codec_id = CODEC_ID_ADPCM_ADX, .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 09b78a9f64..217d8139df 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -415,9 +415,9 @@ typedef struct AVInputFormat { struct AVInputFormat *next; /** - * General purpose read-only value that the format can use. + * Raw demuxers store their codec ID here. */ - int value; + int raw_codec_id; /** * Size of private data so that it can be allocated in the wrapper. diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index d61855d360..95bae54519 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -73,5 +73,5 @@ AVInputFormat ff_dts_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "dts", - .value = CODEC_ID_DTS, + .raw_codec_id = CODEC_ID_DTS, }; diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index d127dc209f..7174fcf758 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -157,5 +157,5 @@ AVInputFormat ff_flac_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "flac", - .value = CODEC_ID_FLAC, + .raw_codec_id = CODEC_ID_FLAC, }; diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index 5d6495860a..3525a038c7 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -62,7 +62,7 @@ static int gsm_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = s->iformat->value; + st->codec->codec_id = s->iformat->raw_codec_id; st->codec->channels = 1; st->codec->sample_rate = c->sample_rate; st->codec->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES; @@ -94,6 +94,6 @@ AVInputFormat ff_gsm_demuxer = { .read_packet = gsm_read_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "gsm", - .value = CODEC_ID_GSM, + .raw_codec_id = CODEC_ID_GSM, .priv_class = &class, }; diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index 35ac649695..bed525fad6 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -68,6 +68,6 @@ AVInputFormat ff_ingenient_demuxer = { .read_packet = ingenient_read_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "cgi", // FIXME - .value = CODEC_ID_MJPEG, + .raw_codec_id = CODEC_ID_MJPEG, .priv_class = &ingenient_demuxer_class, }; diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index b61fb33764..1e36cc4e76 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -70,7 +70,7 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .read_seek = pcm_read_seek, \ .flags = AVFMT_GENERIC_INDEX, \ .extensions = ext, \ - .value = codec, \ + .raw_codec_id = codec, \ .priv_class = &name_ ## _demuxer_class, \ }; diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 9400a0bd32..73b3709ac1 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -38,7 +38,7 @@ int ff_raw_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - id = s->iformat->value; + id = s->iformat->raw_codec_id; if (id == CODEC_ID_RAWVIDEO) { st->codec->codec_type = AVMEDIA_TYPE_VIDEO; } else { @@ -126,7 +126,7 @@ int ff_raw_audio_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = s->iformat->value; + st->codec->codec_id = s->iformat->raw_codec_id; st->need_parsing = AVSTREAM_PARSE_FULL; st->start_time = 0; /* the parameters will be extracted from the compressed bitstream */ @@ -150,7 +150,7 @@ int ff_raw_video_read_header(AVFormatContext *s) } st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = s->iformat->value; + st->codec->codec_id = s->iformat->raw_codec_id; st->need_parsing = AVSTREAM_PARSE_FULL; if ((ret = av_parse_video_rate(&framerate, s1->framerate)) < 0) { @@ -182,7 +182,7 @@ AVInputFormat ff_g722_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "g722,722", - .value = CODEC_ID_ADPCM_G722, + .raw_codec_id = CODEC_ID_ADPCM_G722, }; #endif @@ -194,7 +194,7 @@ AVInputFormat ff_latm_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "latm", - .value = CODEC_ID_AAC_LATM, + .raw_codec_id = CODEC_ID_AAC_LATM, }; #endif @@ -210,7 +210,7 @@ AVInputFormat ff_mlp_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "mlp", - .value = CODEC_ID_MLP, + .raw_codec_id = CODEC_ID_MLP, }; #endif @@ -222,7 +222,7 @@ AVInputFormat ff_truehd_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "thd", - .value = CODEC_ID_TRUEHD, + .raw_codec_id = CODEC_ID_TRUEHD, }; #endif @@ -234,7 +234,7 @@ AVInputFormat ff_shorten_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, .extensions = "shn", - .value = CODEC_ID_SHORTEN, + .raw_codec_id = CODEC_ID_SHORTEN, }; #endif diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index cfb1689cd9..4cce2cf901 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -67,7 +67,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\ .read_packet = ff_raw_read_partial_packet,\ .extensions = ext,\ .flags = AVFMT_GENERIC_INDEX,\ - .value = id,\ + .raw_codec_id = id,\ .priv_data_size = sizeof(FFRawVideoDemuxerContext),\ .priv_class = &shortname ## _demuxer_class,\ }; diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 6ca17d5253..5db4e91f2e 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -68,6 +68,6 @@ AVInputFormat ff_rawvideo_demuxer = { .read_packet = rawvideo_read_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "yuv,cif,qcif,rgb", - .value = CODEC_ID_RAWVIDEO, + .raw_codec_id = CODEC_ID_RAWVIDEO, .priv_class = &rawvideo_demuxer_class, }; |