Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)
* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
configure
libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/ffv1.c
libavcodec/ffv1.h

diff --cc configure
+++ b/configure
@@@ -1944,11 -1687,10 +1944,11 @@@ dxa_decoder_select="zlib
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables dsputil mpegvideo"
 -eatgq_decoder_select="aandcttables dsputil"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables error_resilience mpegvideo"
- ffv1_decoder_select="dsputil golomb rangecoder"
- ffv1_encoder_select="dsputil rangecoder"
 +exr_decoder_select="zlib"
+ ffv1_decoder_select="golomb rangecoder"
+ ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
  ffvhuff_encoder_select="huffyuv_encoder"
  fic_decoder_select="dsputil golomb"
@@@ -49,13 -138,9 +49,11 @@@ av_cold int ffv1_common_init(AVCodecCon
      s->avctx = avctx;
      s->flags = avctx->flags;
  
 -    if (!avctx->width || !avctx->height)
 -        return AVERROR_INVALIDDATA;
 +    s->picture.f = av_frame_alloc();
 +    s->last_picture.f = av_frame_alloc();
 +    if (!s->picture.f || !s->last_picture.f)
 +        return AVERROR(ENOMEM);
  
-     ff_dsputil_init(&s->dsp, avctx);
      s->width  = avctx->width;
      s->height = avctx->height;
  
  #ifndef AVCODEC_FFV1_H
  #define AVCODEC_FFV1_H
  
 -#include <stdint.h>
 +/**
 + * @file
 + * FF Video Codec 1 (a lossless codec)
 + */
  
 +#include "libavutil/avassert.h"
 +#include "libavutil/crc.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/timer.h"
  #include "avcodec.h"
- #include "dsputil.h"
  #include "get_bits.h"
 +#include "internal.h"
 +#include "mathops.h"
  #include "put_bits.h"
  #include "rangecoder.h"
 +#include "thread.h"
 +
 +#ifdef __INTEL_COMPILER
 +#undef av_flatten
 +#define av_flatten
 +#endif
  
  #define MAX_PLANES 4
  #define CONTEXT_SIZE 32