Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 670620
Collapse All | Expand All

(-)a/src/gfxoutputdrv/ffmpegdrv.c.orig (-4 / +7 lines)
Lines 360-366 static int ffmpegdrv_open_audio(AVFormatContext *oc, A Link Here
360
    }
360
    }
361
361
362
    audio_is_open = 1;
362
    audio_is_open = 1;
363
    if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
363
    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
364
        audio_inbuf_samples = 10000;
364
        audio_inbuf_samples = 10000;
365
    } else {
365
    } else {
366
        audio_inbuf_samples = c->frame_size;
366
        audio_inbuf_samples = c->frame_size;
Lines 454-460 static int ffmpegmovie_init_audio(int speed, int chann Link Here
454
454
455
    /* Some formats want stream headers to be separate. */
455
    /* Some formats want stream headers to be separate. */
456
    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
456
    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
457
        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
457
        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
458
458
459
    /* create resampler context */
459
    /* create resampler context */
460
#ifndef HAVE_FFMPEG_AVRESAMPLE
460
#ifndef HAVE_FFMPEG_AVRESAMPLE
Lines 787-793 static void ffmpegdrv_init_video(screenshot_t *screens Link Here
787
787
788
    /* Some formats want stream headers to be separate. */
788
    /* Some formats want stream headers to be separate. */
789
    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
789
    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
790
        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
790
        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
791
    }
791
    }
792
792
793
    if (audio_init_done) {
793
    if (audio_init_done) {
Lines 967-972 static int ffmpegdrv_record(screenshot_t *screenshot) Link Here
967
967
968
    video_st.frame->pts = video_st.next_pts++;
968
    video_st.frame->pts = video_st.next_pts++;
969
969
970
#ifdef AVFMT_RAWPICTURE
970
    if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
971
    if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
971
        AVPacket pkt;
972
        AVPacket pkt;
972
        VICE_P_AV_INIT_PACKET(&pkt);
973
        VICE_P_AV_INIT_PACKET(&pkt);
Lines 977-983 static int ffmpegdrv_record(screenshot_t *screenshot) Link Here
977
        pkt.pts = pkt.dts = video_st.frame->pts;
978
        pkt.pts = pkt.dts = video_st.frame->pts;
978
979
979
        ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
980
        ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
980
    } else {
981
    } else
982
#endif
983
    {
981
        AVPacket pkt = { 0 };
984
        AVPacket pkt = { 0 };
982
        int got_packet;
985
        int got_packet;
983
986

Return to bug 670620