Revision 5d6e4c16 ffplay.c

View differences:

ffplay.c
163 163
    int audio_buf_index; /* in bytes */
164 164
    AVPacket audio_pkt_temp;
165 165
    AVPacket audio_pkt;
166
    enum SampleFormat audio_src_fmt;
166
    enum AVSampleFormat audio_src_fmt;
167 167
    AVAudioConvert *reformat_ctx;
168 168

  
169 169
    int show_audio; /* if true, display audio samples */
......
2095 2095
            if (dec->sample_fmt != is->audio_src_fmt) {
2096 2096
                if (is->reformat_ctx)
2097 2097
                    av_audio_convert_free(is->reformat_ctx);
2098
                is->reformat_ctx= av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
2098
                is->reformat_ctx= av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
2099 2099
                                                         dec->sample_fmt, 1, NULL, 0);
2100 2100
                if (!is->reformat_ctx) {
2101 2101
                    fprintf(stderr, "Cannot convert %s sample format to %s sample format\n",
2102 2102
                        av_get_sample_fmt_name(dec->sample_fmt),
2103
                        av_get_sample_fmt_name(SAMPLE_FMT_S16));
2103
                        av_get_sample_fmt_name(AV_SAMPLE_FMT_S16));
2104 2104
                        break;
2105 2105
                }
2106 2106
                is->audio_src_fmt= dec->sample_fmt;
......
2268 2268
            return -1;
2269 2269
        }
2270 2270
        is->audio_hw_buf_size = spec.size;
2271
        is->audio_src_fmt= SAMPLE_FMT_S16;
2271
        is->audio_src_fmt= AV_SAMPLE_FMT_S16;
2272 2272
    }
2273 2273

  
2274 2274
    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;

Also available in: Unified diff