[SCM] libav/experimental: Declare ff_interleave_new_audio_packet as static, it is not used outside of audiointerleave.c. Also remove the function declaration from the header as it is now static.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:37:14 UTC 2013


The following commit has been merged in the experimental branch:
commit 18099ade6fbacf793e1c4d75ca71906c5abd40e8
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Feb 8 21:09:50 2009 +0000

      Declare ff_interleave_new_audio_packet as static, it is not used
      outside of audiointerleave.c.  Also remove the function declaration
      from the header as it is now static.
    
    Originally committed as revision 17068 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index 056fbe1..fac68d0 100644
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -67,7 +67,7 @@ int ff_audio_interleave_init(AVFormatContext *s,
     return 0;
 }
 
-int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
+static int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
                                    int stream_index, int flush)
 {
     AVStream *st = s->streams[stream_index];
diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h
index d5b2957..9a228f8 100644
--- a/libavformat/audiointerleave.h
+++ b/libavformat/audiointerleave.h
@@ -40,8 +40,6 @@ int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_frame, A
 void ff_audio_interleave_close(AVFormatContext *s);
 
 int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt);
-int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
-                                   int stream_index, int flush);
 /**
  * Rechunk audio pcm packets per AudioInterleaveContext->samples_per_frame
  * and interleave them correctly.

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list