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>
1  2 
configure
libavformat/swf.h
libavformat/swfdec.c

diff --cc configure
Simple merge
Simple merge
   * 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"
 +#include "libavutil/internal.h"
  #include "libavutil/intreadwrite.h"
 +#include "libavcodec/get_bits.h"
  #include "swf.h"
  
  static const AVCodecTag swf_audio_codec_tags[] = {