#include <time.h>
#include <stdarg.h>
#include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
#include "dv.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
struct DVMuxContext {
const DVprofile* sys; /* Current DV profile. E.g.: 525/60, 625/50 */
/* FIXME: we have to have more sensible approach than this one */
if (av_fifo_size(&c->audio_data[i]) + data_size >= 100*AVCODEC_MAX_AUDIO_FRAME_SIZE)
av_log(st->codec, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient video data or severe sync problem.\n", c->frames);
- av_fifo_write(&c->audio_data[i], data, data_size);
+ av_fifo_generic_write(&c->audio_data[i], data, data_size, NULL);
- /* Lets see if we've got enough audio for one DV frame */
+ /* Let us see if we've got enough audio for one DV frame. */
c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i);
break;
break;
}
- /* Lets see if we have enough data to construct one DV frame */
+ /* Let us see if we have enough data to construct one DV frame. */
if (c->has_video == 1 && c->has_audio + 1 == 1<<c->n_ast) {
dv_inject_metadata(c, *frame);
c->has_audio = 0;
#ifdef CONFIG_DV_MUXER
AVOutputFormat dv_muxer = {
"dv",
- "DV video format",
+ NULL_IF_CONFIG_SMALL("DV video format"),
NULL,
"dv",
sizeof(DVMuxContext),