[SCM] libav/experimental: mms: remove dependency on MAX_STREAM API

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:16:56 UTC 2013


The following commit has been merged in the experimental branch:
commit 0f02a7e2d25d3324e10d3e14b02b70ef9285b9bb
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Mon Oct 4 19:45:12 2010 +0000

    mms: remove dependency on MAX_STREAM API
    
    Originally committed as revision 25335 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mms.c b/libavformat/mms.c
index 73f4e6b..d995a43 100644
--- a/libavformat/mms.c
+++ b/libavformat/mms.c
@@ -24,6 +24,12 @@
 #include "asf.h"
 #include "libavutil/intreadwrite.h"
 
+#if FF_API_MAX_STREAMS
+#define MMS_MAX_STREAMS MAX_STREAMS
+#else
+#define MMS_MAX_STREAMS 256    /**< arbitrary sanity check value */
+#endif
+
 int ff_mms_read_header(MMSContext *mms, uint8_t *buf, const int size)
 {
     char *pos;
@@ -97,7 +103,7 @@ int ff_mms_asf_header_parser(MMSContext *mms)
             //The second condition is for checking CS_PKT_STREAM_ID_REQUEST packet size,
             //we can calcuate the packet size by stream_num.
             //Please see function send_stream_selection_request().
-            if (mms->stream_num < MAX_STREAMS &&
+            if (mms->stream_num < MMS_MAX_STREAMS &&
                     46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) {
                 mms->streams = av_fast_realloc(mms->streams,
                                    &mms->nb_streams_allocated,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list