diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 20:14:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-08 00:25:25 +0200 |
commit | 36583d23bdbe31e8845d3ca9162bce33fef6e48c (patch) | |
tree | 72cecb7d252e298a2bdc51260b4aca89dde26960 /libavcodec/audio_frame_queue.h | |
parent | 364c71c80e9124a2624e3bfeb8e84c5cddeda222 (diff) | |
download | ffmpeg-36583d23bdbe31e8845d3ca9162bce33fef6e48c.tar.gz |
audio_frame_que: simplify
Also update libav->ffmpeg as theres pretty much no code left from libav.
The new code is faster, requires fewer mallocs and less memory. Its
also half the number of lines of code.
This code is not 100% identical in behavior to the previous, but the
differences appear to be rather limitations of the previous design
than intended though i could be wrong of course.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/audio_frame_queue.h')
-rw-r--r-- | libavcodec/audio_frame_queue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/audio_frame_queue.h b/libavcodec/audio_frame_queue.h index cfcc6a030c..edb2fd2f3c 100644 --- a/libavcodec/audio_frame_queue.h +++ b/libavcodec/audio_frame_queue.h @@ -27,15 +27,15 @@ typedef struct AudioFrame { int64_t pts; int duration; - struct AudioFrame *next; } AudioFrame; typedef struct AudioFrameQueue { AVCodecContext *avctx; - int64_t next_pts; int remaining_delay; int remaining_samples; - AudioFrame *frame_queue; + AudioFrame *frames; + unsigned frame_count; + unsigned frame_alloc; } AudioFrameQueue; /** |