#include <math.h>
#include "config.h"
-#include "avformat.h"
-#include "avfilter.h"
-#include "avdevice.h"
+#include "libavformat/avformat.h"
+#include "libavfilter/avfilter.h"
+#include "libavdevice/avdevice.h"
+#include "libavutil/avstring.h"
#include "cmdutils.h"
-#include "avstring.h"
#include "version.h"
#ifdef CONFIG_NETWORK
-#include "network.h"
+#include "libavformat/network.h"
#endif
#undef exit
#include <errno.h>
#include <signal.h>
#include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "swscale.h"
-#include "framehook.h"
-#include "opt.h"
-#include "fifo.h"
-#include "avstring.h"
-#include "os_support.h"
+#include "libavformat/avformat.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/opt.h"
+#include "libavutil/fifo.h"
+#include "libavutil/avstring.h"
+#include "libavformat/os_support.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#include <math.h>
#include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "rtsp.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/rtsp.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
#include "version.h"
#include "cmdutils.h"
#endif
#include <string.h>
#include <stdlib.h>
-#include "avformat.h"
-#include "rtsp.h"
-#include "rtp.h"
-#include "os_support.h"
+#include "libavutil/random.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/network.h"
+#include "libavformat/os_support.h"
+#include "libavformat/rtp.h"
+#include "libavformat/rtsp.h"
#include <stdarg.h>
#include <unistd.h>
#include <dlfcn.h>
#endif
-#include "network.h"
#include "version.h"
#include "ffserver.h"
-#include "random.h"
-#include "avstring.h"
#include "cmdutils.h"
#undef exit
#include <math.h>
#include <string.h>
+#include "libavutil/crc.h"
+#include "libavutil/random.h"
#include "avcodec.h"
#include "ac3_parser.h"
#include "bitstream.h"
-#include "crc.h"
#include "dsputil.h"
-#include "random.h"
/** Maximum possible frame size when the specification limit is ignored */
#define AC3_MAX_FRAME_SIZE 21695
*/
//#define DEBUG
//#define DEBUG_BITALLOC
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
-#include "crc.h"
#include "ac3.h"
typedef struct AC3EncodeContext {
#ifndef FFMPEG_AC3TAB_H
#define FFMPEG_AC3TAB_H
-#include "common.h"
+#include "libavutil/common.h"
extern const uint16_t ff_ac3_frame_size_tab[38][3];
extern const uint8_t ff_ac3_channels_tab[8];
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
extern void simple_idct_axp(DCTELEM *block);
extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
void get_pixels_mvi(DCTELEM *restrict block,
const uint8_t *restrict pixels, int line_size)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "asm.h"
-#include "dsputil.h"
-#include "mpegvideo.h"
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
int line_size);
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#ifdef HAVE_IPP
#include <ipp.h>
#endif
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
#define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
extern void MPV_common_init_iwmmxt(MpegEncContext *s);
extern void MPV_common_init_armv5te(MpegEncContext *s);
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#ifdef ENABLE_ARM_TESTS
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
* @sa http://www.svatopluk.com/andux/docs/dfvid.html
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#include "bethsoftvideo.h"
#include "bytestream.h"
* @sa http://wiki.multimedia.cx/index.php?title=BFI
*/
+#include "libavutil/common.h"
#include "avcodec.h"
-#include "common.h"
#include "bytestream.h"
typedef struct BFIContext {
*/
#include <unistd.h>
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
int off;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_bfin.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text;
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
-#include "common.h"
-#include "bswap.h"
-#include "intreadwrite.h"
-#include "log.h"
+#include "libavutil/bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/log.h"
#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
# define ALT_BITSTREAM_READER
#ifndef FFMPEG_BYTESTREAM_H
#define FFMPEG_BYTESTREAM_H
-#include "common.h"
+#include "libavutil/common.h"
#define DEF_T(type, name, bytes, read, write) \
static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
#include <string.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "cabac.h"
//#undef NDEBUG
#include <assert.h>
#ifdef ARCH_X86
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
#endif
#define CABAC_BITS 16
#include <stddef.h>
#include <stdio.h>
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
#include "bytestream.h"
-#include "random.h"
#include "cookdata.h"
#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
-#include "lzo.h"
+#include "libavutil/lzo.h"
typedef struct {
AVFrame pic;
#ifndef FFMPEG_DVDATA_H
#define FFMPEG_DVDATA_H
+#include "libavutil/rational.h"
#include "avcodec.h"
-#include "rational.h"
/*
* DVprofile is used to express the differences between various
#include <string.h>
+#include "libavutil/random.h"
#include "elbg.h"
#include "avcodec.h"
-#include "random.h"
#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentual error)
#ifndef FFMPEG_ELBG_H
#define FFMPEG_ELBG_H
-#include "random.h"
+#include "libavutil/random.h"
/**
* Implementation of the Enhanced LBG Algorithm
#include <limits.h>
#define ALT_BITSTREAM_READER
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
#include "golomb.h"
-#include "crc.h"
#include "flac.h"
#undef NDEBUG
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/crc.h"
+#include "libavutil/lls.h"
#include "avcodec.h"
#include "bitstream.h"
-#include "crc.h"
#include "dsputil.h"
#include "golomb.h"
-#include "lls.h"
#define FLAC_MAX_CH 8
#define FLAC_MIN_BLOCKSIZE 16
#include <string.h>
#include <unistd.h>
+#include "libavutil/bswap.h"
#include "avcodec.h"
-#include "bswap.h"
#define FLI_256_COLOR 4
#define FLI_DELTA 7
* @author Michael Niedermayer <michaelni@gmx.at>
*/
-#include "common.h"
+#include "libavutil/common.h"
const uint8_t ff_golomb_vlc_len[512]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
#define FFMPEG_H264DATA_H
#include <stdint.h>
+#include "libavutil/rational.h"
#include "mpegvideo.h"
-#include "rational.h"
#define EXTENDED_SAR 255
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "mpegvideo.h"
#include "h264data.h"
#ifndef FFMPEG_H264PRED_H
#define FFMPEG_H264PRED_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* Prediction types
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
-#include "common.h"
-#include "x86_cpu.h"
/*****************************************************************************
*
*/
#include <stdlib.h>
-#include "dsputil.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#undef printf
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/h263.h"
+#include "libavcodec/mpegvideo.h"
+#include "libavcodec/simple_idct.h"
#include "dsputil_mmx.h"
-#include "simple_idct.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
#include "mmx.h"
#include "vp3dsp_mmx.h"
#include "vp3dsp_sse2.h"
#include "idct_xvid.h"
-#include "h263.h"
//#undef NDEBUG
//#include <assert.h>
#define FFMPEG_DSPUTIL_MMX_H
#include <stdint.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
typedef struct { uint64_t a, b; } xmm_t;
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "dsputil.h"
+
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1p1p1m1[4] __attribute__((aligned(16))) =
{ 0, 0, 0, 1 << 31 };
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/x86_cpu.h"
#include "dsputil_mmx.h"
-#include "x86_cpu.h"
static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
{
#ifndef FFMPEG_H264_I386_H
#define FFMPEG_H264_I386_H
-
-#include "cabac.h"
+#include "libavcodec/cabac.h"
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
//as that would make optimization work hard)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
*/
#include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
//=============================================================================
// Macros and other preprocessor constants
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
/*!
* @file idct_sse2_xvid.c
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
0x0000000000000000ULL,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
-#include "x86_cpu.h"
extern uint16_t inv_zigzag_direct16[64];
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "simple_idct.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/simple_idct.h"
/*
23170.475006
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "snow.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/snow.h"
void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
const int w2= (width+1)>>1;
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
-#include "x86_cpu.h"
/** Add rounder from mm7 to mm3 and pack result at destination */
#define NORMALIZE_MMX(SHIFT) \
* MMX-optimized functions cribbed from the original VP3 source code.
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
#define IdctAdjustBeforeShift 8
* SSE2-optimized functions cribbed from the original VP3 source code.
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
#ifndef FFMPEG_VP3DSP_SSE2_H
#define FFMPEG_VP3DSP_SSE2_H
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
void ff_vp3_idct_sse2(int16_t *input_data);
void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
#include <stdlib.h>
#include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define DCTSIZE 8
#include <stdlib.h>
#include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define SHIFT_TEMPS
* Independent JPEG Group's LLM idct.
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define EIGHT_BIT_SAMPLES
*/
/* FFmpeg includes */
+#include "libavutil/log.h"
#include "avcodec.h"
-#include "log.h"
/* libtheora includes */
#include <theora/theora.h>
#ifndef FFMPEG_MATHOPS_H
#define FFMPEG_MATHOPS_H
-#include "common.h"
+#include "libavutil/common.h"
#ifdef ARCH_X86_32
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include <mlib_types.h>
#include <mlib_status.h>
* MLP parser
*/
+#include "libavutil/crc.h"
#include "bitstream.h"
#include "parser.h"
-#include "crc.h"
#include "mlp_parser.h"
static const uint8_t mlp_quants[16] = {
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
#ifndef FFMPEG_MPC_H
#define FFMPEG_MPC_H
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
#define FFMPEG_MPEG12DATA_H
#include <stdint.h>
-#include "rational.h"
+#include "libavutil/rational.h"
#include "rl.h"
extern const uint16_t ff_mpeg1_default_intra_matrix[64];
#ifndef FFMPEG_MPEGAUDIODATA_H
#define FFMPEG_MPEGAUDIODATA_H
-#include "common.h"
+#include "libavutil/common.h"
#define MODE_EXT_MS_STEREO 2
#define MODE_EXT_I_STEREO 1
#ifndef FFMPEG_MPEGAUDIODECHEADER_H
#define FFMPEG_MPEGAUDIODECHEADER_H
-#include "common.h"
+#include "libavutil/common.h"
#include "mpegaudio.h"
#ifndef FFMPEG_MSMPEG4DATA_H
#define FFMPEG_MSMPEG4DATA_H
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "rl.h"
* The 3 alphanumeric copyright notices are md5summed they are from the original
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
*/
+
+#include "libavutil/random.h"
#include "avcodec.h"
-#include "random.h"
#include "dsputil.h"
#define ALT_BITSTREAM_READER_LE
#include <stdio.h>
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/lzo.h"
#include "avcodec.h"
-
-#include "bswap.h"
#include "dsputil.h"
-#include "lzo.h"
#include "rtjpeg.h"
typedef struct {
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_ppc.h"
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_ppc.h"
#include "gcc_fixes.h"
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
** integer misc ops.
**/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
#include <stdlib.h>
#include <stdio.h>
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/snow.h"
#include "gcc_fixes.h"
#include "dsputil_altivec.h"
-#include "snow.h"
#undef NDEBUG
#include <assert.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmi.h"
void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmi.h"
#define BITS_INV_ACC 5 // 4 or 5 for IEEE
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
static void dct_unquantize_h263_mmi(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
#include <stdint.h>
#include <assert.h>
-#include "common.h"
+#include "libavutil/common.h"
typedef struct RangeCoder{
int low;
#ifndef FFMPEG_RECTANGLE_H
#define FFMPEG_RECTANGLE_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* fill a rectangle.
#ifndef FFMPEG_ROQVIDEO_H
#define FFMPEG_ROQVIDEO_H
+#include "libavutil/random.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "random.h"
typedef struct {
unsigned char y[4];
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "dsputil.h"
#include "rtjpeg.h"
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#define LP(p) *(uint32_t*)(p)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
static void memzero_align8(void *dst,size_t size)
{
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#define c1 1.38703984532214752434 /* sqrt(2)*cos(1*pi/16) */
#define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */
#define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */
#include <inttypes.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "vis.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
static const DECLARE_ALIGNED_8(int16_t, coeffs[28]) = {
- 1259,- 1259,- 1259,- 1259,
* utils.
*/
+#include "libavutil/integer.h"
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "integer.h"
#include "opt.h"
-#include "crc.h"
#include "imgconvert.h"
#include <stdarg.h>
#include <limits.h>
#define FFMPEG_VC1DATA_H
#include <stdint.h>
+#include "libavutil/rational.h"
#include "bitstream.h"
-#include "rational.h"
/** Table for conversion between TTBLK and TTMB */
extern const int ff_vc1_ttblk_to_tt[3][8];
#ifndef FFMPEG_VP56DATA_H
#define FFMPEG_VP56DATA_H
-#include "common.h"
+#include "libavutil/common.h"
typedef enum {
VP56_FRAME_CURRENT = 0,
#ifndef FFMPEG_XIPH_H
#define FFMPEG_XIPH_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* Splits a single extradata buffer into the three headers that most
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+
#include "config.h"
+#include "libavformat/avformat.h"
#define REGISTER_MUXER(X,x) { \
extern AVOutputFormat x##_muxer; \
#include <sys/ioctl.h>
#include <sys/time.h>
-#include "log.h"
-#include "avcodec.h"
-#include "avformat.h"
+#include "libavutil/log.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
#define AUDIO_BLOCK_SIZE 4096
#include <SoundPlayer.h>
extern "C" {
-#include "avformat.h"
+#include "libavformat/avformat.h"
}
#ifdef HAVE_BSOUNDRECORDER
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+
+#include "libavformat/avformat.h"
#if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
# include <dev/bktr/ioctl_meteor.h>
# include <dev/bktr/ioctl_bt848.h>
#include <sys/time.h>
#include <time.h>
-#include "avformat.h"
+#include "libavformat/avformat.h"
#undef DV1394_DEBUG
+#include "libavformat/dv.h"
#include "dv1394.h"
-#include "dv.h"
struct dv1394_data {
int fd;
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#if ENABLE_LIBDC1394_2
#include <dc1394/dc1394.h>
*/
#include "config.h"
-#include "avformat.h"
-#include "dsputil.h"
+#include "libavformat/avformat.h"
+#include "libavcodec/dsputil.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <vfw.h>
#include <windows.h>
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/imgconvert.h"
#include "avfilter.h"
-#include "imgconvert.h"
/** list of registered filters */
struct FilterList
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT
#include <stddef.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
typedef struct AVFilterContext AVFilterContext;
typedef struct AVFilterLink AVFilterLink;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/imgconvert.h"
#include "avfilter.h"
-#include "imgconvert.h"
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
void avfilter_default_free_video_buffer(AVFilterPic *pic)
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
#define ADTS_HEADER_SIZE 7
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/intfloat_readwrite.h"
#include "avformat.h"
#include "raw.h"
#include "riff.h"
-#include "intfloat_readwrite.h"
static const AVCodecTag codec_aiff_tags[] = {
{ CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') },
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/common.h"
+#include "libavcodec/mpegaudio.h"
#include "avformat.h"
#include "riff.h"
-#include "mpegaudio.h"
#include "asf.h"
-#include "common.h"
#include "asfcrypt.h"
extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "intreadwrite.h"
-#include "bswap.h"
-#include "des.h"
-#include "rc4.h"
+
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/bswap.h"
+#include "libavutil/des.h"
+#include "libavutil/rc4.h"
#include "asfcrypt.h"
/**
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
+#include "libavcodec/opt.h"
#include "avformat.h"
-#include "avstring.h"
-#include "opt.h"
#if LIBAVFORMAT_VERSION_MAJOR >= 53
/** @name Logging context. */
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
#include "avformat.h"
#include "avio.h"
-#include "crc.h"
#include <stdarg.h>
#define IO_BUFFER_SIZE 32768
*/
#include "avformat.h"
-#include "bethsoftvideo.h"
+#include "libavcodec/bethsoftvideo.h"
typedef struct BVID_DemuxContext
{
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/adler32.h"
#include "avformat.h"
-#include "adler32.h"
typedef struct CRCState {
uint32_t crcval;
*/
#include <time.h>
#include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
#include "dv.h"
struct DVDemuxContext {
#include <time.h>
#include <stdarg.h>
#include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
#include "dv.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
struct DVMuxContext {
const DVprofile* sys; /* Current DV profile. E.g.: 525/60, 625/50 */
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
#include "avformat.h"
-#include "avstring.h"
#include <fcntl.h>
#include <unistd.h>
#include <sys/time.h>
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/adler32.h"
#include "avformat.h"
-#include "adler32.h"
static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
* Prototypes for interface to .so that implement a video processing hook
*/
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
/* Function must be called 'Configure' */
typedef int (FrameHookConfigure)(void **ctxp, int argc, char *argv[]);
*/
#include "avformat.h"
-#include "bitstream.h"
+#include "libavcodec/bitstream.h"
/* bitstream minipacket size */
#define GIF_CHUNKS 100
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/common.h"
#include "avformat.h"
-#include "common.h"
#include "gxf.h"
typedef struct {
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/fifo.h"
#include "avformat.h"
#include "gxf.h"
#include "riff.h"
-#include "fifo.h"
#define GXF_AUDIO_PACKET_SIZE 65536
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
#include "avformat.h"
#include <unistd.h>
#include "network.h"
#include "os_support.h"
-#include "base64.h"
-#include "avstring.h"
-
/* XXX: POST protocol is not completely implemented because ffmpeg uses
only a subset of it. */
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
#include "avformat.h"
-#include "avstring.h"
typedef struct {
int img_first;
#ifndef FFMPEG_MATROSKA_H
#define FFMPEG_MATROSKA_H
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
/* EBML version supported */
#define EBML_VERSION 1
#include "avformat.h"
/* For codec_get_id(). */
#include "riff.h"
-#include "intfloat_readwrite.h"
#include "matroska.h"
#include "libavcodec/mpeg4audio.h"
+#include "libavutil/intfloat_readwrite.h"
#include "libavutil/lzo.h"
typedef struct Track {
*/
#include "avformat.h"
-#include "md5.h"
#include "riff.h"
-#include "xiph.h"
#include "matroska.h"
#include "avc.h"
+#include "libavutil/md5.h"
+#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
typedef struct ebml_master {
#include "riff.h"
#include "isom.h"
#include "dv.h"
-#include "mpeg4audio.h"
-#include "mpegaudiodata.h"
+#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/mpegaudiodata.h"
#ifdef CONFIG_ZLIB
#include <zlib.h>
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
+#include "libavcodec/mpegaudio.h"
+#include "libavcodec/mpegaudiodecheader.h"
#include "avformat.h"
-#include "mpegaudio.h"
-#include "avstring.h"
-#include "mpegaudiodecheader.h"
#define ID3v2_HEADER_SIZE 10
#define ID3v1_TAG_SIZE 128
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
#define MPC_FRAMESIZE 1152
#define DELAY_FRAMES 32
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
+#include "libavcodec/unary.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "unary.h"
/// Two-byte MPC tag
#define MKMPCTAG(a, b) (a | (b << 8))
#define FFMPEG_MPEG_H
#include <stdint.h>
-#include "intreadwrite.h"
+#include "libavutil/intreadwrite.h"
#define PACK_START_CODE ((unsigned int)0x000001ba)
#define SYSTEM_HEADER_START_CODE ((unsigned int)0x000001bb)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/fifo.h"
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "fifo.h"
#include "mpeg.h"
#define MAX_PAYLOAD_SIZE 4096
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
#include "avformat.h"
-#include "crc.h"
#include "mpegts.h"
//#define DEBUG_SI
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
#include "avformat.h"
-#include "crc.h"
#include "mpegts.h"
/* write DVB SI sections */
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "bytestream.h"
#define HEADER_SIZE 24
* MTV demuxer.
*/
+#include "libavutil/bswap.h"
#include "avformat.h"
-#include "bswap.h"
#define MTV_ASUBCHUNK_DATA_SIZE 500
#define MTV_HEADER_SIZE 512
//#define DEBUG
+#include "libavutil/aes.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "aes.h"
-#include "bytestream.h"
typedef uint8_t UID[16];
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/tree.h"
#include "nut.h"
-#include "tree.h"
const AVCodecTag ff_nut_subtitle_tags[] = {
{ CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
#define FFMPEG_NUT_H
//#include <limits.h>
+//#include "libavutil/adler32.h"
+//#include "libavcodec/mpegaudio.h"
#include "avformat.h"
-//#include "mpegaudio.h"
#include "riff.h"
-//#include "adler32.h"
#define MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
#define STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "tree.h"
+#include "libavutil/avstring.h"
+#include "libavutil/tree.h"
#include "nut.h"
-#include "avstring.h"
#undef NDEBUG
#include <assert.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/tree.h"
+#include "libavcodec/mpegaudiodata.h"
#include "nut.h"
-#include "tree.h"
-#include "mpegaudiodata.h"
static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
int sample_rate= c->sample_rate;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/crc.h"
+#include "libavcodec/xiph.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "crc.h"
-#include "xiph.h"
-#include "bytestream.h"
typedef struct {
int64_t duration;
*/
#include <stdlib.h>
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
#include "oggdec.h"
#define FLAC_STREAMINFO_SIZE 0x22
**/
#include <stdlib.h>
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "intreadwrite.h"
#include "oggdec.h"
#include "riff.h"
**/
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
#include "oggdec.h"
-#include "avstring.h"
static int speex_header(AVFormatContext *s, int idx) {
ogg_t *ogg = s->priv_data;
**/
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
#include "oggdec.h"
typedef struct theora_params {
**/
#include <stdlib.h>
+#include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
#include "oggdec.h"
-#include "avstring.h"
extern int
vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
+#include "libavcodec/ac3_parser.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
#include "avformat.h"
-#include "ac3_parser.h"
#include "raw.h"
-#include "crc.h"
-#include "bitstream.h"
-#include "bytestream.h"
#ifdef CONFIG_MUXERS
/* simple formats */
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/avcodec.h"
#include "avformat.h"
-#include "avcodec.h"
#include "riff.h"
/* Note: when encoding, the first matching tag is used, so order is
#ifndef FFMPEG_RIFF_H
#define FFMPEG_RIFF_H
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
#include "avio.h"
offset_t start_tag(ByteIOContext *pb, const char *tag);
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
#include "avformat.h"
#include "rm.h"
-#include "avstring.h"
static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
{
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/avstring.h"
#include "avformat.h"
-#include "avstring.h"
#include <stdlib.h>
#define RPL_SIGNATURE "ARMovie\x0A"
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
#include <unistd.h>
#include "network.h"
#ifndef FFMPEG_RTP_H
#define FFMPEG_RTP_H
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
#include "avformat.h"
#define RTP_MIN_PACKET_LENGTH 12
*
*/
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
#include "avformat.h"
#include "mpegts.h"
-#include "bitstream.h"
#include <unistd.h>
#include "network.h"
#include "rtp_internal.h"
#include "rtp_h264.h"
-#include "base64.h"
-#include "avstring.h"
/**
RTP/H264 specific private data.
#define FFMPEG_RTP_INTERNAL_H
#include <stdint.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
#include "rtp.h"
// these statistics are used for rtcp receiver reports...
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/mpegvideo.h"
#include "avformat.h"
#include "rtp_internal.h"
-#include "mpegvideo.h"
-
/* NOTE: a single frame must be passed with sequence header if
needed. XXX: use slices. */
void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
#include "mpegts.h"
-#include "bitstream.h"
#include <unistd.h>
#include "network.h"
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
#include "mpegts.h"
-#include "bitstream.h"
#include <unistd.h>
#include "network.h"
* RTP protocol
*/
+#include "libavutil/avstring.h"
#include "avformat.h"
-#include "avstring.h"
#include <unistd.h>
#include <stdarg.h>
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
#include "avformat.h"
#include <sys/time.h>
#include <unistd.h> /* for select() prototype */
#include "network.h"
-#include "avstring.h"
#include "rtsp.h"
#include "rtp_internal.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavutil/base64.h"
#include "avformat.h"
#include "avc.h"
-#include "base64.h"
#include "rtp.h"
#ifdef CONFIG_RTP_MUXER
* Based on http://wiki.multimedia.cx/index.php?title=Smacker
*/
+#include "libavutil/bswap.h"
#include "avformat.h"
#include "riff.h"
-#include "bswap.h"
#define SMACKER_PAL 0x01
#define SMACKER_FLAG_RING_FRAME 0x01
* Based on documents from Game Audio Player and own research
*/
+#include "libavutil/bswap.h"
#include "avformat.h"
#include "raw.h"
#include "riff.h"
-#include "bswap.h"
/* if we don't know the size in advance */
#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
#include "riff.h" /* for CodecTag */
/* should have a generic way to indicate probable size */
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
typedef struct {
int totalframes, currentframe;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "opt.h"
-#include "avstring.h"
+#include "libavcodec/opt.h"
+#include "libavutil/avstring.h"
#include "riff.h"
#include <sys/time.h>
#include <time.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/bswap.h"
#include "avformat.h"
-#include "bswap.h"
// specs say that maximum block size is 1Mb
#define WV_BLOCK_LIMIT 1047576
//Changelog: use the Subversion log
#include "config.h"
-#include "avutil.h"
+#include "libavutil/avutil.h"
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avutil.h"
+#include "libavutil/avutil.h"
#define ALTIVEC_TRANSPOSE_8x8_SHORT(src_a,src_b,src_c,src_d,src_e,src_f,src_g,src_h) \
do { \
#ifndef FFMPEG_POSTPROCESS_INTERNAL_H
#define FFMPEG_POSTPROCESS_INTERNAL_H
-#include "avutil.h"
+#include "libavutil/avutil.h"
#include "postprocess.h"
#define V_DEBLOCK 0x01
* mmx/mmx2/3dnow postprocess code.
*/
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
#define ALIGN_MASK "$-8"
#define M_PI 3.14159265358979323846
#endif
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
#undef exit
+#undef fprintf
+#undef printf
+#undef snprintf
/* 5 seconds stream duration */
#define STREAM_DURATION 5.0
#include <stdlib.h>
#include <stdio.h>
-#include "avformat.h"
+#include "libavformat/avformat.h"
#undef exit
#define MAXSIZE_TEXT 1024
-#include "framehook.h"
+#include "libavformat/framehook.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
-#include "framehook.h"
-#include "dsputil.h"
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/dsputil.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
#include <stdio.h>
#include <stdlib.h>
*/
#include <stdio.h>
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
-#include "framehook.h"
-#include "avformat.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/framehook.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
#include <unistd.h>
#include <stdarg.h>
-#include "common.h"
-#include "avformat.h"
-
-#include "framehook.h"
+#include "libavutil/common.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
#include "cmdutils.h"
-#include "swscale.h"
static int sws_flags = SWS_BICUBIC;