Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b02493e47668
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 047dcfabc7e8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2012

  1. afq: update remaining samples variable.

    Fixes Ticket1785 (opusenc used this variable)
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Oct 4, 2012
    Copy the full SHA
    b27e2b6 View commit details
  2. afq: sanity assert on remaining_samples

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Oct 4, 2012
    Copy the full SHA
    047dcfa View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 libavcodec/audio_frame_queue.c
2 changes: 2 additions & 0 deletions libavcodec/audio_frame_queue.c
Original file line number Diff line number Diff line change
@@ -95,12 +95,14 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
if(afq->frames[i].pts != AV_NOPTS_VALUE)
afq->frames[i].pts += n;
}
afq->remaining_samples -= removed_samples;
i -= i && afq->frames[i-1].duration;
memmove(afq->frames, afq->frames + i, sizeof(*afq->frames) * (afq->frame_count - i));
afq->frame_count -= i;

if(nb_samples){
av_assert0(!afq->frame_count);
av_assert0(afq->remaining_samples == afq->remaining_delay);
if(afq->frames && afq->frames[0].pts != AV_NOPTS_VALUE)
afq->frames[0].pts += nb_samples;
av_log(afq->avctx, AV_LOG_DEBUG, "Trying to remove %d more samples than are in the que\n", nb_samples);