virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

Browse Source 
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-26 12:56:46 +01:00
commit 9b1a0c2ee8
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/arm/dca.h
View File

@ -22,8 +22,9 @@
#define AVCODEC_ARM_DCA_H
#include <stdint.h>
#include "config.h"
#include "libavutil/intmath.h"
#include "libavcodec/mathops.h"
#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB

2
libavcodec/dcadec.c
View File

@ -30,7 +30,6 @@
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "libavutil/intmath.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "libavutil/samplefmt.h"
@ -42,6 +41,7 @@
#include "dcahuff.h"
#include "dca.h"
#include "dca_parser.h"
#include "mathops.h"
#include "synth_filter.h"
#include "dcadsp.h"
#include "fmtconvert.h"

2
libavcodec/fft-internal.h
View File

@ -36,7 +36,7 @@
#else
#include "libavutil/intmath.h"
#include "fft.h"
#include "mathops.h"
void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);

1
libavcodec/ra144dec.c
View File

@ -23,7 +23,6 @@
*/
#include "libavutil/channel_layout.h"
#include "libavutil/intmath.h"
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"

1
libavcodec/ratecontrol.c
View File

@ -25,7 +25,6 @@
* Rate control for video encoders.
*/
#include "libavutil/intmath.h"
#include "avcodec.h"
#include "dsputil.h"
#include "ratecontrol.h"