Browse code

ffplay: remove pts_ptr argument from audio_decode_frame()

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

Stefano Sabatini authored on 2013/02/03 00:09:24
Showing 1 changed files
... ...
@@ -2089,7 +2089,7 @@ static int synchronize_audio(VideoState *is, int nb_samples)
2089 2089
  * stored in is->audio_buf, with size in bytes given by the return
2090 2090
  * value.
2091 2091
  */
2092
-static int audio_decode_frame(VideoState *is, double *pts_ptr)
2092
+static int audio_decode_frame(VideoState *is)
2093 2093
 {
2094 2094
     AVPacket *pkt_temp = &is->audio_pkt_temp;
2095 2095
     AVPacket *pkt = &is->audio_pkt;
... ...
@@ -2097,7 +2097,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
2097 2097
     int len1, len2, data_size, resampled_data_size;
2098 2098
     int64_t dec_channel_layout;
2099 2099
     int got_frame;
2100
-    double pts;
2100
+    av_unused double pts;
2101 2101
     int new_packet = 0;
2102 2102
     int flush_complete = 0;
2103 2103
     int wanted_nb_samples;
... ...
@@ -2196,7 +2196,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
2196 2196
 
2197 2197
             /* if no pts, then compute it */
2198 2198
             pts = is->audio_clock;
2199
-            *pts_ptr = pts;
2200 2199
             is->audio_clock += (double)data_size /
2201 2200
                 (is->frame->channels * is->frame->sample_rate * av_get_bytes_per_sample(is->frame->format));
2202 2201
 #ifdef DEBUG
... ...
@@ -2248,13 +2247,12 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
2248 2248
     int audio_size, len1;
2249 2249
     int bytes_per_sec;
2250 2250
     int frame_size = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, 1, is->audio_tgt.fmt, 1);
2251
-    double pts;
2252 2251
 
2253 2252
     audio_callback_time = av_gettime();
2254 2253
 
2255 2254
     while (len > 0) {
2256 2255
         if (is->audio_buf_index >= is->audio_buf_size) {
2257
-           audio_size = audio_decode_frame(is, &pts);
2256
+           audio_size = audio_decode_frame(is);
2258 2257
            if (audio_size < 0) {
2259 2258
                 /* if error, just output silence */
2260 2259
                is->audio_buf      = is->silence_buf;