Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

[ffmpeg] / libavcodec / audio_frame_queue.c

diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c
index 7db0091c0c2150f1e75bb62b4743ea6a3a2bfa59..ba6e22516cb8ba19a849a0752cd09a00ee4820c1 100644 (file)
--- a/libavcodec/audio_frame_queue.c
+++ b/libavcodec/audio_frame_queue.c
@@ -35,7 +35,7 @@ void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq)
 void ff_af_queue_close(AudioFrameQueue *afq)
 {
     if(afq->frame_count)
-        av_log(afq->avctx, AV_LOG_WARNING, "%d frames left in que on closing\n", afq->frame_count);
+        av_log(afq->avctx, AV_LOG_WARNING, "%d frames left in the queue on closing\n", afq->frame_count);
     av_freep(&afq->frames);
     memset(afq, 0, sizeof(*afq));
 }
@@ -57,7 +57,7 @@ int ff_af_queue_add(AudioFrameQueue *afq, const AVFrame *f)
                                       (AVRational){ 1, afq->avctx->sample_rate });
         new->pts -= afq->remaining_delay;
         if(afq->frame_count && new[-1].pts >= new->pts)
-            av_log(afq->avctx, AV_LOG_WARNING, "Que input is backward in time\n");
+            av_log(afq->avctx, AV_LOG_WARNING, "Queue input is backward in time\n");
     } else {
         new->pts = AV_NOPTS_VALUE;
     }
@@ -83,7 +83,7 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
             out_pts = afq->frames->pts;
     }
     if(!afq->frame_count)
-        av_log(afq->avctx, AV_LOG_WARNING, "Trying to remove %d samples, but que empty\n", nb_samples);
+        av_log(afq->avctx, AV_LOG_WARNING, "Trying to remove %d samples, but the queue is empty\n", nb_samples);
     if (pts)
         *pts = ff_samples_to_time_base(afq->avctx, out_pts);
 
@@ -105,7 +105,7 @@ void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
         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);
+        av_log(afq->avctx, AV_LOG_DEBUG, "Trying to remove %d more samples than there are in the queue\n", nb_samples);
     }
     if (duration)
         *duration = ff_samples_to_time_base(afq->avctx, removed_samples);