[FFmpeg-cvslog] ffplay: remove pts_ptr argument from audio_decode_frame()

Stefano Sabatini git at videolan.org
Sun Feb 3 17:09:03 CET 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Feb  2 16:09:24 2013 +0100| [6e32b377bbb590fa024e0ffe1bc3911033133c59] | committer: Stefano Sabatini

ffplay: remove pts_ptr argument from audio_decode_frame()

The argument is no longer used outside the function. Simplify.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e32b377bbb590fa024e0ffe1bc3911033133c59
---

 ffplay.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 7e65a17..183523c 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2089,7 +2089,7 @@ static int synchronize_audio(VideoState *is, int nb_samples)
  * stored in is->audio_buf, with size in bytes given by the return
  * value.
  */
-static int audio_decode_frame(VideoState *is, double *pts_ptr)
+static int audio_decode_frame(VideoState *is)
 {
     AVPacket *pkt_temp = &is->audio_pkt_temp;
     AVPacket *pkt = &is->audio_pkt;
@@ -2097,7 +2097,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
     int len1, len2, data_size, resampled_data_size;
     int64_t dec_channel_layout;
     int got_frame;
-    double pts;
+    av_unused double pts;
     int new_packet = 0;
     int flush_complete = 0;
     int wanted_nb_samples;
@@ -2196,7 +2196,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
 
             /* if no pts, then compute it */
             pts = is->audio_clock;
-            *pts_ptr = pts;
             is->audio_clock += (double)data_size /
                 (is->frame->channels * is->frame->sample_rate * av_get_bytes_per_sample(is->frame->format));
 #ifdef DEBUG
@@ -2248,13 +2247,12 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
     int audio_size, len1;
     int bytes_per_sec;
     int frame_size = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, 1, is->audio_tgt.fmt, 1);
-    double pts;
 
     audio_callback_time = av_gettime();
 
     while (len > 0) {
         if (is->audio_buf_index >= is->audio_buf_size) {
-           audio_size = audio_decode_frame(is, &pts);
+           audio_size = audio_decode_frame(is);
            if (audio_size < 0) {
                 /* if error, just output silence */
                is->audio_buf      = is->silence_buf;



More information about the ffmpeg-cvslog mailing list