summaryrefslogtreecommitdiff
path: root/libavcodec/audio_frame_queue.h
Commit message (Collapse)AuthorAge
* Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'Hendrik Leppkes2015-09-29
|\ | | | | | | | | | | | | * commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d': lavc: Make AVPacket.duration int64, and deprecate convergence_duration Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Make AVPacket.duration int64, and deprecate convergence_durationwm42015-09-29
| | | | | | | | | | | | | | | | | | Note that convergence_duration had another meaning, one which was in practice never used. The only real use for it was a 64 bit replacement for the duration field. It's better just to make duration 64 bits, and to get rid of it. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: audio_frame_queue: Clean up ff_af_queue_log_state debug function dwt: Remove unused code. cavs: convert cavsdata.h to a .c file cavs: Move inline functions only used in one file out of the header cavs: Move data tables used in only one place to that file fate: Add a single symbol Ut Video decoder test vf_hqdn3d: x86 asm vf_hqdn3d: support 16bit colordepth avconv: prefer user-forced input framerate when choosing output framerate Conflicts: ffmpeg.c libavcodec/audio_frame_queue.c libavcodec/dwt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_frame_queue: Clean up ff_af_queue_log_state debug functionDiego Biurrun2012-08-26
| | | | | | | | | | | | The function is debug-only, so only compile it in debug mode. Make it static as it has no uses outside of the file. Change av_log() to av_dlog().
* | audio_frame_que: simplifyMichael Niedermayer2012-05-08
|/ | | | | | | | | | | | 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>
* avcodec: add code for a frame queue for use by audio encoders with delayJustin Ruggles2012-03-20
This simplifies matching of timestamps between input frames and output packets.