diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-13 18:26:01 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-14 01:56:28 +0200 |
| commit | 323b930699179cb17b39fddaa9aba3379c0c9e26 (patch) | |
| tree | 4f5be7de15f1dadc4c838ae4434ea77dbe5eb233 /libavformat/dvenc.c | |
| parent | a9d1878abe81ae8085d12590c5d089a49a0714e7 (diff) | |
| download | ffmpeg-323b930699179cb17b39fddaa9aba3379c0c9e26.tar.gz | |
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
The new function provides a more flexible interface for peeking at a
FIFO buffer data.
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 289f1249e9..ae348297b4 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -187,8 +187,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 */ } |