Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 16:48:42 +0000 (18:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 16:54:15 +0000 (18:54 +0200)
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
  Remove a number of unnecessary dsputil.h #includes

Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
1  2 
libavcodec/arm/vp3dsp_init_arm.c
libavcodec/binkdsp.c
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c
libavcodec/h264pred.c
libavcodec/indeo5.c
libavcodec/mpeg12.c
libavcodec/msmpeg4dec.c
libavcodec/mss4.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
libavcodec/vp3dsp.c
libavcodec/vp56.h
libavcodec/x86/vp3dsp_init.c

Simple merge
Simple merge
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  #include "avcodec.h"
- #include "dsputil.h"
  #include "get_bits.h"
  #include "bytestream.h"
  #include "libavutil/colorspace.h"
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  #include "avcodec.h"
  #include "get_bits.h"
- #include "dsputil.h"
  #include "internal.h"
  
  #include "libavutil/attributes.h"
   */
  
  #include "libavutil/attributes.h"
- #include "dsputil.h"
 +#include "libavutil/avassert.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avcodec.h"
  #include "h264pred.h"
- #include "avcodec.h" // for AV_CODEC_ID_*
  
  #define BIT_DEPTH 8
  #include "h264pred_template.c"
Simple merge
   * MPEG-1/2 decoder
   */
  
 +#define UNCHECKED_BITSTREAM_READER 1
 +
  #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
 +#include "libavutil/timecode.h"
 +
  #include "internal.h"
  #include "avcodec.h"
- #include "dsputil.h"
  #include "mpegvideo.h"
  #include "error_resilience.h"
  #include "mpeg12.h"
Simple merge
Simple merge
   *
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
 +#include "libavutil/intreadwrite.h"
+ #include "dsputil.h"
  #include "h264chroma.h"
 +#include "rnd_avg.h"
  #include "vc1dsp.h"
  
  /* Apply overlap transform to horizontal edge */
Simple merge
Simple merge
Simple merge
@@@ -23,9 -21,7 +23,8 @@@
  #include "libavutil/attributes.h"
  #include "libavutil/cpu.h"
  #include "libavutil/x86/cpu.h"
 +#include "libavutil/x86/asm.h"
  #include "libavcodec/avcodec.h"
- #include "libavcodec/dsputil.h"
  #include "libavcodec/vp3dsp.h"
  #include "config.h"