1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'

* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
  Remove a number of unnecessary dsputil.h #includes

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-05 18:48:42 +02:00
commit 5440151fa4
14 changed files with 5 additions and 14 deletions

View File

@ -21,7 +21,6 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/arm/cpu.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/vp3dsp.h"
void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);

View File

@ -25,7 +25,6 @@
*/
#include "libavutil/attributes.h"
#include "dsputil.h"
#include "binkdsp.h"
#define A1 2896 /* (1/sqrt(2))<<12 */

View File

@ -18,8 +18,8 @@
* 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"

View File

@ -18,9 +18,9 @@
* 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"

View File

@ -27,9 +27,9 @@
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "dsputil.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"

View File

@ -30,7 +30,6 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
#include "ivi_dsp.h"
#include "ivi_common.h"
#include "indeo5data.h"

View File

@ -33,7 +33,6 @@
#include "internal.h"
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "error_resilience.h"
#include "mpeg12.h"

View File

@ -23,7 +23,6 @@
*/
#include "avcodec.h"
#include "dsputil.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "msmpeg4.h"

View File

@ -27,7 +27,6 @@
#include "avcodec.h"
#include "bytestream.h"
#include "dsputil.h"
#include "get_bits.h"
#include "internal.h"
#include "mss34dsp.h"

View File

@ -28,6 +28,7 @@
#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"

View File

@ -28,7 +28,6 @@
#ifndef AVCODEC_VC1DSP_H
#define AVCODEC_VC1DSP_H
#include "dsputil.h"
#include "hpeldsp.h"
#include "h264chroma.h"

View File

@ -29,7 +29,6 @@
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "dsputil.h"
#include "rnd_avg.h"
#include "vp3dsp.h"

View File

@ -26,7 +26,6 @@
#ifndef AVCODEC_VP56_H
#define AVCODEC_VP56_H
#include "dsputil.h"
#include "get_bits.h"
#include "hpeldsp.h"
#include "bytestream.h"

View File

@ -25,7 +25,6 @@
#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"