On Wed, 11 May 2011 14:00:06 -0700, Alex Converse <aconve...@google.com> wrote:
> From: Stefano Sabatini <stefano.sabatini-l...@poste.it>
>
> 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)
> ---
> ffplay.c | 16 +++++++---------
> 1 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/ffplay.c b/ffplay.c
> index 07727b6..75b98d7 100644
> --- a/ffplay.c
> +++ b/ffplay.c
> @@ -220,7 +220,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;
> @@ -770,6 +769,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;
> @@ -2148,14 +2154,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)
> {
> --
> 1.7.3.1
>
Looks ok.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
