Merge commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:58:55 +0000 (08:58 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:58:55 +0000 (08:58 +0100)
* commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278':
  swfdec: support compressed swf

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
configure
libavformat/swf.h
libavformat/swfdec.c

index 4dcb27b..2282cfb 100755 (executable)
--- a/configure
+++ b/configure
@@ -2728,6 +2728,7 @@ sdp_demuxer_select="rtpdec"
 smoothstreaming_muxer_select="ismv_muxer"
 spdif_muxer_select="aac_parser"
 spx_muxer_select="ogg_muxer"
+swf_demuxer_suggest="zlib"
 tak_demuxer_select="tak_parser"
 tg2_muxer_select="mov_muxer"
 tgp_muxer_select="mov_muxer"
index 93a094c..ab67c75 100644 (file)
@@ -134,8 +134,8 @@ typedef struct SWFContext {
     AVCodecContext *audio_enc, *video_enc;
     AVStream *video_st;
 #if CONFIG_ZLIB
-    AVIOContext *zpb;
 #define ZBUF_SIZE 4096
+    AVIOContext *zpb;
     uint8_t *zbuf_in;
     uint8_t *zbuf_out;
     z_stream zstream;
index e596ffa..eb17e82 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/imgutils.h"