diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:14:59 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:22:52 +0200 |
| commit | b01891a9f08b9d271d75d179b3138242a958ee04 (patch) | |
| tree | 6180f466be7e17e8059b3ab69a1fb5d95e776e32 /libavcodec/audio_frame_queue.c | |
| parent | d3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b (diff) | |
| parent | 948f3c19a8bd069768ca411212aaf8c1ed96b10d (diff) | |
| download | ffmpeg-b01891a9f08b9d271d75d179b3138242a958ee04.tar.gz | |
Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/audio_frame_queue.c')
| -rw-r--r-- | libavcodec/audio_frame_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c index 4f6bccce36..f2ccd69281 100644 --- a/libavcodec/audio_frame_queue.c +++ b/libavcodec/audio_frame_queue.c @@ -73,7 +73,7 @@ int ff_af_queue_add(AudioFrameQueue *afq, const AVFrame *f) } void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts, - int *duration) + int64_t *duration) { int64_t out_pts = AV_NOPTS_VALUE; int removed_samples = 0; |