Browse Source

lavf: deprecate AVFormatParameters.{channels,sample_rate}.

Anton Khirnov 14 years ago
parent
commit
bffd4dd1d3

+ 2 - 0
libavdevice/alsa-audio-dec.c

@@ -60,11 +60,13 @@ static av_cold int audio_read_header(AVFormatContext *s1,
     enum CodecID codec_id;
     snd_pcm_sw_params_t *sw_params;
 
+#if FF_API_FORMAT_PARAMETERS
     if (ap->sample_rate > 0)
         s->sample_rate = ap->sample_rate;
 
     if (ap->channels > 0)
         s->channels = ap->channels;
+#endif
 
     st = av_new_stream(s1, 0);
     if (!st) {

+ 2 - 0
libavdevice/oss_audio.c

@@ -218,10 +218,12 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     AVStream *st;
     int ret;
 
+#if FF_API_FORMAT_PARAMETERS
     if (ap->sample_rate > 0)
         s->sample_rate = ap->sample_rate;
     if (ap->channels > 0)
         s->channels = ap->channels;
+#endif
 
     st = av_new_stream(s1, 0);
     if (!st) {

+ 2 - 0
libavdevice/sndio_dec.c

@@ -34,10 +34,12 @@ static av_cold int audio_read_header(AVFormatContext *s1,
     AVStream *st;
     int ret;
 
+#if FF_API_FORMAT_PARAMETERS
     if (ap->sample_rate > 0)
         s->sample_rate = ap->sample_rate;
     if (ap->channels > 0)
         s->channels = ap->channels;
+#endif
 
     st = av_new_stream(s1, 0);
     if (!st)

+ 4 - 2
libavformat/avformat.h

@@ -228,8 +228,10 @@ typedef struct AVProbeData {
 
 typedef struct AVFormatParameters {
     AVRational time_base;
-    int sample_rate;
-    int channels;
+#if FF_API_FORMAT_PARAMETERS
+    attribute_deprecated int sample_rate;
+    attribute_deprecated int channels;
+#endif
     int width;
     int height;
     enum PixelFormat pix_fmt;

+ 2 - 0
libavformat/rawdec.c

@@ -47,11 +47,13 @@ int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
         case AVMEDIA_TYPE_AUDIO: {
             RawAudioDemuxerContext *s1 = s->priv_data;
 
+#if FF_API_FORMAT_PARAMETERS
             if (ap->sample_rate)
                 st->codec->sample_rate = ap->sample_rate;
             if (ap->channels)
                 st->codec->channels    = ap->channels;
             else st->codec->channels   = 1;
+#endif
 
             if (s1->sample_rate)
                 st->codec->sample_rate = s1->sample_rate;