RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278' 

* commit '7570c9e04f010c9b3bfdeb4338d330f2cdd25278':
  swfdec: support compressed swf

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-19 08:58:55 +01:00
parent 25955c927f 7570c9e04f
commit e816fe7401
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -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"

2
libavformat/swf.h
View 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;

6
libavformat/swfdec.c
View File

@ -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"