diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-29 17:30:23 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-26 20:53:02 +0200 |
| commit | f2011ed234f580de01768257f3da6e73fbf8ac7b (patch) | |
| tree | 86ea1bac14e765c42e82cda13f0c43ee5fcfc462 /libavformat/dvenc.c | |
| parent | f4f3300c09bb13eb7922e60888b55e3e0fb325e7 (diff) | |
| download | ffmpeg-f2011ed234f580de01768257f3da6e73fbf8ac7b.tar.gz | |
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
The new function provides a more generic interface than av_fifo_peek()
for peeking at a FIFO buffer data.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/dvenc.c')
| -rw-r--r-- | libavformat/dvenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 15b659bc8d..5c55338e2c 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -192,8 +192,8 @@ static void dv_inject_audio(DVMuxContext *c, int channel, uint8_t* frame_ptr) 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 */ } |