Revision c957c854

View differences:

ffmpeg.c
672 672
            AVPacket pkt;
673 673
            av_init_packet(&pkt);
674 674

  
675
            av_fifo_read(ost->fifo, audio_buf, frame_bytes);
675
            av_fifo_generic_read(ost->fifo, frame_bytes, NULL, audio_buf);
676 676

  
677 677
            //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio()
678 678

  
......
1452 1452
                            if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
1453 1453
                                int fs_tmp = enc->frame_size;
1454 1454
                                enc->frame_size = fifo_bytes / (2 * enc->channels);
1455
                                av_fifo_read(ost->fifo, (uint8_t *)samples, fifo_bytes);
1455
                                av_fifo_generic_read(ost->fifo, fifo_bytes, NULL, samples);
1456 1456
                                    ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
1457 1457
                                enc->frame_size = fs_tmp;
1458 1458
                            }
libavformat/audiointerleave.c
80 80
        return 0;
81 81

  
82 82
    av_new_packet(pkt, size);
83
    av_fifo_read(aic->fifo, pkt->data, size);
83
    av_fifo_generic_read(aic->fifo, size, NULL, pkt->data);
84 84

  
85 85
    pkt->dts = pkt->pts = aic->dts;
86 86
    pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base);
libavutil/fifo.c
63 63

  
64 64
        if (!f2)
65 65
            return -1;
66
        av_fifo_read(f, f2->buffer, len);
66
        av_fifo_generic_read(f, len, NULL, f2->buffer);
67 67
        f2->wptr += len;
68 68
        f2->wndx += len;
69 69
        av_free(f->buffer);

Also available in: Unified diff