if (of*2 >= size)
continue;
- frame_ptr[d] = av_fifo_peek(c->audio_data[channel], of*2+1); // FIXME: maybe we have to admit
- frame_ptr[d+1] = av_fifo_peek(c->audio_data[channel], of*2); // that DV is a big-endian PCM
+ frame_ptr[d] = *av_fifo_peek2(c->audio_data[channel], of*2+1); // FIXME: maybe we have to admit
+ frame_ptr[d+1] = *av_fifo_peek2(c->audio_data[channel], of*2); // that DV is a big-endian PCM
}
frame_ptr += 16 * 80; /* 15 Video DIFs + 1 Audio DIF */
}
c->ast[i]->codec->channels != 2))
goto bail_out;
}
- c->sys = ff_dv_codec_profile(vst->codec);
+ c->sys = avpriv_dv_codec_profile(vst->codec);
if (!c->sys)
goto bail_out;
}
AVOutputFormat ff_dv_muxer = {
- "dv",
- NULL_IF_CONFIG_SMALL("DV video format"),
- NULL,
- "dv",
- sizeof(DVMuxContext),
- CODEC_ID_PCM_S16LE,
- CODEC_ID_DVVIDEO,
- dv_write_header,
- dv_write_packet,
- dv_write_trailer,
+ .name = "dv",
+ .long_name = NULL_IF_CONFIG_SMALL("DV video format"),
+ .extensions = "dv",
+ .priv_data_size = sizeof(DVMuxContext),
+ .audio_codec = CODEC_ID_PCM_S16LE,
+ .video_codec = CODEC_ID_DVVIDEO,
+ .write_header = dv_write_header,
+ .write_packet = dv_write_packet,
+ .write_trailer = dv_write_trailer,
};