From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Tue, 12 Apr 2011 10:06:49 +0000 (+0200)
Subject: ffplay: remove audio_write_get_buf_size() forward declaration
X-Git-Tag: android-x86-4.4-r1~12310^2~1287
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a7c977417f7904a6213048ed3e57dd79264d3d5;p=android-x86%2Fexternal-ffmpeg.git

ffplay: remove audio_write_get_buf_size() forward declaration

Move up the definition of audio_write_get_buf_size(), so that it is
defined before it is used. Simplify.
(cherry picked from commit 8776f3d22e401e30d17856e341f6cabbbefa92f7)
---

diff --git a/ffplay.c b/ffplay.c
index e820c603e3..a5dc358f72 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -218,7 +218,6 @@ typedef struct VideoState {
 } VideoState;
 
 static void show_help(void);
-static int audio_write_get_buf_size(VideoState *is);
 
 /* options specified by the user */
 static AVInputFormat *file_iformat;
@@ -768,6 +767,13 @@ static void video_image_display(VideoState *is)
     }
 }
 
+/* get the current audio output buffer size, in samples. With SDL, we
+   cannot have a precise information */
+static int audio_write_get_buf_size(VideoState *is)
+{
+    return is->audio_buf_size - is->audio_buf_index;
+}
+
 static inline int compute_mod(int a, int b)
 {
     a = a % b;
@@ -2146,14 +2152,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
     }
 }
 
-/* get the current audio output buffer size, in samples. With SDL, we
-   cannot have a precise information */
-static int audio_write_get_buf_size(VideoState *is)
-{
-    return is->audio_buf_size - is->audio_buf_index;
-}
-
-
 /* prepare a new audio buffer */
 static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 {