diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:58:55 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:58:55 +0100 |
commit | e816fe7401c900146d5230855a676f689136b884 (patch) | |
tree | 8c2f766ad0efb413f9580d747d6939f82aba04ab /libavformat | |
parent | 25955c927fcf88d1deea16f2d4ff86eb5a78a774 (diff) | |
parent | 7570c9e04f010c9b3bfdeb4338d330f2cdd25278 (diff) | |
download | ffmpeg-streaming-e816fe7401c900146d5230855a676f689136b884.zip ffmpeg-streaming-e816fe7401c900146d5230855a676f689136b884.tar.gz |
Merge commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278'
* commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278':
swfdec: support compressed swf
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/swf.h | 2 | ||||
-rw-r--r-- | libavformat/swfdec.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/swf.h b/libavformat/swf.h index 93a094c..ab67c75 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -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; diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index e596ffa..eb17e82 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -20,6 +20,12 @@ * 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" |