Browse code
Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2008/05/09 20:56:36Showing 192 changed files
- cmdutils.c
- ffmpeg.c
- ffplay.c
- ffserver.c
- libavcodec/ac3dec.c
- libavcodec/ac3enc.c
- libavcodec/ac3tab.h
- libavcodec/alpha/dsputil_alpha.c
- libavcodec/alpha/motion_est_alpha.c
- libavcodec/alpha/mpegvideo_alpha.c
- libavcodec/alpha/simple_idct_alpha.c
- libavcodec/armv4l/dsputil_arm.c
- libavcodec/armv4l/dsputil_iwmmxt.c
- libavcodec/armv4l/mpegvideo_arm.c
- libavcodec/armv4l/mpegvideo_armv5te.c
- libavcodec/armv4l/mpegvideo_iwmmxt.c
- libavcodec/bethsoftvideo.c
- libavcodec/bfi.c
- libavcodec/bfin/dsputil_bfin.c
- libavcodec/bfin/mpegvideo_bfin.c
- libavcodec/bfin/vp3_bfin.c
- libavcodec/bitstream.h
- libavcodec/bytestream.h
- libavcodec/cabac.c
- libavcodec/cabac.h
- libavcodec/cook.c
- libavcodec/cscd.c
- libavcodec/dvdata.h
- libavcodec/elbg.c
- libavcodec/elbg.h
- libavcodec/flac.c
- libavcodec/flacenc.c
- libavcodec/flicvideo.c
- libavcodec/golomb.c
- libavcodec/h264data.h
- libavcodec/h264enc.c
- libavcodec/h264pred.h
- libavcodec/i386/cavsdsp_mmx.c
- libavcodec/i386/cpuid.c
- libavcodec/i386/dsputil_mmx.c
- libavcodec/i386/dsputil_mmx.h
- libavcodec/i386/dsputilenc_mmx.c
- libavcodec/i386/fdct_mmx.c
- libavcodec/i386/fft_3dn.c
- libavcodec/i386/fft_3dn2.c
- libavcodec/i386/fft_sse.c
- libavcodec/i386/flacdsp_mmx.c
- libavcodec/i386/h264_i386.h
- libavcodec/i386/idct_mmx.c
- libavcodec/i386/idct_mmx_xvid.c
- libavcodec/i386/idct_sse2_xvid.c
- libavcodec/i386/motion_est_mmx.c
- libavcodec/i386/mpegvideo_mmx.c
- libavcodec/i386/simple_idct_mmx.c
- libavcodec/i386/snowdsp_mmx.c
- libavcodec/i386/vc1dsp_mmx.c
- libavcodec/i386/vp3dsp_mmx.c
- libavcodec/i386/vp3dsp_sse2.c
- libavcodec/i386/vp3dsp_sse2.h
- libavcodec/jfdctfst.c
- libavcodec/jfdctint.c
- libavcodec/jrevdct.c
- libavcodec/libtheoraenc.c
- libavcodec/mathops.h
- libavcodec/mlib/dsputil_mlib.c
- libavcodec/mlp_parser.c
- libavcodec/mpc.c
- libavcodec/mpc.h
- libavcodec/mpc7.c
- libavcodec/mpc8.c
- libavcodec/mpeg12data.h
- libavcodec/mpegaudiodata.h
- libavcodec/mpegaudiodecheader.h
- libavcodec/msmpeg4data.h
- libavcodec/nellymoserdec.c
- libavcodec/nuv.c
- libavcodec/ppc/dsputil_altivec.c
- libavcodec/ppc/dsputil_ppc.c
- libavcodec/ppc/fdct_altivec.c
- libavcodec/ppc/fft_altivec.c
- libavcodec/ppc/float_altivec.c
- libavcodec/ppc/gmc_altivec.c
- libavcodec/ppc/h264_altivec.c
- libavcodec/ppc/idct_altivec.c
- libavcodec/ppc/int_altivec.c
- libavcodec/ppc/mpegvideo_altivec.c
- libavcodec/ppc/snow_altivec.c
- libavcodec/ppc/vc1dsp_altivec.c
- libavcodec/ps2/dsputil_mmi.c
- libavcodec/ps2/idct_mmi.c
- libavcodec/ps2/mpegvideo_mmi.c
- libavcodec/rangecoder.h
- libavcodec/rectangle.h
- libavcodec/roqvideo.h
- libavcodec/rtjpeg.c
- libavcodec/sh4/dsputil_align.c
- libavcodec/sh4/dsputil_sh4.c
- libavcodec/sh4/idct_sh4.c
- libavcodec/sparc/dsputil_vis.c
- libavcodec/sparc/simple_idct_vis.c
- libavcodec/utils.c
- libavcodec/vc1data.h
- libavcodec/vp56data.h
- libavcodec/xiph.h
- libavdevice/alldevices.c
- libavdevice/audio.c
- libavdevice/beosaudio.cpp
- libavdevice/bktr.c
- libavdevice/dv1394.c
- libavdevice/libdc1394.c
- libavdevice/v4l.c
- libavdevice/v4l2.c
- libavdevice/vfwcap.c
- libavdevice/x11grab.c
- libavfilter/avfilter.c
- libavfilter/avfilter.h
- libavfilter/defaults.c
- libavformat/adtsenc.c
- libavformat/aiff.c
- libavformat/asf.c
- libavformat/asfcrypt.c
- libavformat/avio.c
- libavformat/aviobuf.c
- libavformat/bethsoftvid.c
- libavformat/crcenc.c
- libavformat/dv.c
- libavformat/dvenc.c
- libavformat/file.c
- libavformat/framecrcenc.c
- libavformat/framehook.h
- libavformat/gif.c
- libavformat/gxf.c
- libavformat/gxfenc.c
- libavformat/http.c
- libavformat/img2.c
- libavformat/matroska.h
- libavformat/matroskadec.c
- libavformat/matroskaenc.c
- libavformat/mov.c
- libavformat/mp3.c
- libavformat/mpc.c
- libavformat/mpc8.c
- libavformat/mpeg.h
- libavformat/mpegenc.c
- libavformat/mpegts.c
- libavformat/mpegtsenc.c
- libavformat/msnwc_tcp.c
- libavformat/mtv.c
- libavformat/mxf.c
- libavformat/nut.c
- libavformat/nut.h
- libavformat/nutdec.c
- libavformat/nutenc.c
- libavformat/oggenc.c
- libavformat/oggparseflac.c
- libavformat/oggparseogm.c
- libavformat/oggparsespeex.c
- libavformat/oggparsetheora.c
- libavformat/oggparsevorbis.c
- libavformat/raw.c
- libavformat/riff.c
- libavformat/riff.h
- libavformat/rmdec.c
- libavformat/rpl.c
- libavformat/rtp.c
- libavformat/rtp.h
- libavformat/rtp_h264.c
- libavformat/rtp_internal.h
- libavformat/rtp_mpv.c
- libavformat/rtpdec.c
- libavformat/rtpenc.c
- libavformat/rtpproto.c
- libavformat/rtsp.c
- libavformat/sdp.c
- libavformat/smacker.c
- libavformat/sol.c
- libavformat/swf.c
- libavformat/tta.c
- libavformat/utils.c
- libavformat/wv.c
- libpostproc/postprocess.c
- libpostproc/postprocess_altivec_template.c
- libpostproc/postprocess_internal.h
- libpostproc/postprocess_template.c
- output_example.c
- tests/seek_test.c
- vhook/drawtext.c
- vhook/fish.c
- vhook/imlib2.c
- vhook/null.c
- vhook/ppm.c
- vhook/watermark.c
| ... | ... |
@@ -25,14 +25,14 @@ |
| 25 | 25 |
#include <math.h> |
| 26 | 26 |
|
| 27 | 27 |
#include "config.h" |
| 28 |
-#include "avformat.h" |
|
| 29 |
-#include "avfilter.h" |
|
| 30 |
-#include "avdevice.h" |
|
| 28 |
+#include "libavformat/avformat.h" |
|
| 29 |
+#include "libavfilter/avfilter.h" |
|
| 30 |
+#include "libavdevice/avdevice.h" |
|
| 31 |
+#include "libavutil/avstring.h" |
|
| 31 | 32 |
#include "cmdutils.h" |
| 32 |
-#include "avstring.h" |
|
| 33 | 33 |
#include "version.h" |
| 34 | 34 |
#ifdef CONFIG_NETWORK |
| 35 |
-#include "network.h" |
|
| 35 |
+#include "libavformat/network.h" |
|
| 36 | 36 |
#endif |
| 37 | 37 |
|
| 38 | 38 |
#undef exit |
| ... | ... |
@@ -27,14 +27,14 @@ |
| 27 | 27 |
#include <errno.h> |
| 28 | 28 |
#include <signal.h> |
| 29 | 29 |
#include <limits.h> |
| 30 |
-#include "avformat.h" |
|
| 31 |
-#include "avdevice.h" |
|
| 32 |
-#include "swscale.h" |
|
| 33 |
-#include "framehook.h" |
|
| 34 |
-#include "opt.h" |
|
| 35 |
-#include "fifo.h" |
|
| 36 |
-#include "avstring.h" |
|
| 37 |
-#include "os_support.h" |
|
| 30 |
+#include "libavformat/avformat.h" |
|
| 31 |
+#include "libavdevice/avdevice.h" |
|
| 32 |
+#include "libswscale/swscale.h" |
|
| 33 |
+#include "libavformat/framehook.h" |
|
| 34 |
+#include "libavcodec/opt.h" |
|
| 35 |
+#include "libavutil/fifo.h" |
|
| 36 |
+#include "libavutil/avstring.h" |
|
| 37 |
+#include "libavformat/os_support.h" |
|
| 38 | 38 |
|
| 39 | 39 |
#ifdef HAVE_SYS_RESOURCE_H |
| 40 | 40 |
#include <sys/resource.h> |
| ... | ... |
@@ -21,11 +21,11 @@ |
| 21 | 21 |
|
| 22 | 22 |
#include <math.h> |
| 23 | 23 |
#include <limits.h> |
| 24 |
-#include "avformat.h" |
|
| 25 |
-#include "avdevice.h" |
|
| 26 |
-#include "rtsp.h" |
|
| 27 |
-#include "swscale.h" |
|
| 28 |
-#include "avstring.h" |
|
| 24 |
+#include "libavutil/avstring.h" |
|
| 25 |
+#include "libavformat/avformat.h" |
|
| 26 |
+#include "libavformat/rtsp.h" |
|
| 27 |
+#include "libavdevice/avdevice.h" |
|
| 28 |
+#include "libswscale/swscale.h" |
|
| 29 | 29 |
|
| 30 | 30 |
#include "version.h" |
| 31 | 31 |
#include "cmdutils.h" |
| ... | ... |
@@ -25,10 +25,13 @@ |
| 25 | 25 |
#endif |
| 26 | 26 |
#include <string.h> |
| 27 | 27 |
#include <stdlib.h> |
| 28 |
-#include "avformat.h" |
|
| 29 |
-#include "rtsp.h" |
|
| 30 |
-#include "rtp.h" |
|
| 31 |
-#include "os_support.h" |
|
| 28 |
+#include "libavutil/random.h" |
|
| 29 |
+#include "libavutil/avstring.h" |
|
| 30 |
+#include "libavformat/avformat.h" |
|
| 31 |
+#include "libavformat/network.h" |
|
| 32 |
+#include "libavformat/os_support.h" |
|
| 33 |
+#include "libavformat/rtp.h" |
|
| 34 |
+#include "libavformat/rtsp.h" |
|
| 32 | 35 |
|
| 33 | 36 |
#include <stdarg.h> |
| 34 | 37 |
#include <unistd.h> |
| ... | ... |
@@ -47,11 +50,8 @@ |
| 47 | 47 |
#include <dlfcn.h> |
| 48 | 48 |
#endif |
| 49 | 49 |
|
| 50 |
-#include "network.h" |
|
| 51 | 50 |
#include "version.h" |
| 52 | 51 |
#include "ffserver.h" |
| 53 |
-#include "random.h" |
|
| 54 |
-#include "avstring.h" |
|
| 55 | 52 |
#include "cmdutils.h" |
| 56 | 53 |
|
| 57 | 54 |
#undef exit |
| ... | ... |
@@ -32,12 +32,12 @@ |
| 32 | 32 |
#include <math.h> |
| 33 | 33 |
#include <string.h> |
| 34 | 34 |
|
| 35 |
+#include "libavutil/crc.h" |
|
| 36 |
+#include "libavutil/random.h" |
|
| 35 | 37 |
#include "avcodec.h" |
| 36 | 38 |
#include "ac3_parser.h" |
| 37 | 39 |
#include "bitstream.h" |
| 38 |
-#include "crc.h" |
|
| 39 | 40 |
#include "dsputil.h" |
| 40 |
-#include "random.h" |
|
| 41 | 41 |
|
| 42 | 42 |
/** Maximum possible frame size when the specification limit is ignored */ |
| 43 | 43 |
#define AC3_MAX_FRAME_SIZE 21695 |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 22 | 23 |
#include "asm.h" |
| 23 |
-#include "dsputil.h" |
|
| 24 | 24 |
|
| 25 | 25 |
extern void simple_idct_axp(DCTELEM *block); |
| 26 | 26 |
extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 22 | 23 |
#include "asm.h" |
| 23 |
-#include "dsputil.h" |
|
| 24 | 24 |
|
| 25 | 25 |
void get_pixels_mvi(DCTELEM *restrict block, |
| 26 | 26 |
const uint8_t *restrict pixels, int line_size) |
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/mpegvideo.h" |
|
| 22 | 24 |
#include "asm.h" |
| 23 |
-#include "dsputil.h" |
|
| 24 |
-#include "mpegvideo.h" |
|
| 25 | 25 |
|
| 26 | 26 |
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block, |
| 27 | 27 |
int n, int qscale) |
| ... | ... |
@@ -26,8 +26,8 @@ |
| 26 | 26 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 27 | 27 |
*/ |
| 28 | 28 |
|
| 29 |
+#include "libavcodec/dsputil.h" |
|
| 29 | 30 |
#include "asm.h" |
| 30 |
-#include "dsputil.h" |
|
| 31 | 31 |
|
| 32 | 32 |
extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, |
| 33 | 33 |
int line_size); |
| ... | ... |
@@ -19,7 +19,7 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
-#include "dsputil.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 | 23 |
|
| 24 | 24 |
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt |
| 25 | 25 |
#define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
|
| ... | ... |
@@ -18,9 +18,9 @@ |
| 18 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 |
*/ |
| 20 | 20 |
|
| 21 |
-#include "dsputil.h" |
|
| 22 |
-#include "mpegvideo.h" |
|
| 23 |
-#include "avcodec.h" |
|
| 21 |
+#include "libavcodec/avcodec.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/mpegvideo.h" |
|
| 24 | 24 |
|
| 25 | 25 |
extern void MPV_common_init_iwmmxt(MpegEncContext *s); |
| 26 | 26 |
extern void MPV_common_init_armv5te(MpegEncContext *s); |
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
-#include "dsputil.h" |
|
| 23 |
-#include "mpegvideo.h" |
|
| 24 |
-#include "avcodec.h" |
|
| 22 |
+#include "libavcodec/avcodec.h" |
|
| 23 |
+#include "libavcodec/dsputil.h" |
|
| 24 |
+#include "libavcodec/mpegvideo.h" |
|
| 25 | 25 |
|
| 26 | 26 |
|
| 27 | 27 |
#ifdef ENABLE_ARM_TESTS |
| ... | ... |
@@ -18,9 +18,9 @@ |
| 18 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 |
*/ |
| 20 | 20 |
|
| 21 |
-#include "dsputil.h" |
|
| 22 |
-#include "mpegvideo.h" |
|
| 23 |
-#include "avcodec.h" |
|
| 21 |
+#include "libavcodec/avcodec.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/mpegvideo.h" |
|
| 24 | 24 |
|
| 25 | 25 |
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, |
| 26 | 26 |
DCTELEM *block, int n, int qscale) |
| ... | ... |
@@ -20,9 +20,9 @@ |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 | 22 |
|
| 23 |
-#include "dsputil.h" |
|
| 24 |
-#include "mpegvideo.h" |
|
| 25 |
-#include "avcodec.h" |
|
| 23 |
+#include "libavcodec/avcodec.h" |
|
| 24 |
+#include "libavcodec/dsputil.h" |
|
| 25 |
+#include "libavcodec/mpegvideo.h" |
|
| 26 | 26 |
#include "dsputil_bfin.h" |
| 27 | 27 |
|
| 28 | 28 |
|
| ... | ... |
@@ -18,8 +18,8 @@ |
| 18 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 |
*/ |
| 20 | 20 |
|
| 21 |
-#include "avcodec.h" |
|
| 22 |
-#include "dsputil.h" |
|
| 21 |
+#include "libavcodec/avcodec.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 | 23 |
#include "dsputil_bfin.h" |
| 24 | 24 |
|
| 25 | 25 |
extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text; |
| ... | ... |
@@ -29,10 +29,10 @@ |
| 29 | 29 |
#include <stdint.h> |
| 30 | 30 |
#include <stdlib.h> |
| 31 | 31 |
#include <assert.h> |
| 32 |
-#include "common.h" |
|
| 33 |
-#include "bswap.h" |
|
| 34 |
-#include "intreadwrite.h" |
|
| 35 |
-#include "log.h" |
|
| 32 |
+#include "libavutil/bswap.h" |
|
| 33 |
+#include "libavutil/common.h" |
|
| 34 |
+#include "libavutil/intreadwrite.h" |
|
| 35 |
+#include "libavutil/log.h" |
|
| 36 | 36 |
|
| 37 | 37 |
#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) |
| 38 | 38 |
# define ALT_BITSTREAM_READER |
| ... | ... |
@@ -19,12 +19,12 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/crc.h" |
|
| 23 |
+#include "libavutil/lls.h" |
|
| 22 | 24 |
#include "avcodec.h" |
| 23 | 25 |
#include "bitstream.h" |
| 24 |
-#include "crc.h" |
|
| 25 | 26 |
#include "dsputil.h" |
| 26 | 27 |
#include "golomb.h" |
| 27 |
-#include "lls.h" |
|
| 28 | 28 |
|
| 29 | 29 |
#define FLAC_MAX_CH 8 |
| 30 | 30 |
#define FLAC_MIN_BLOCKSIZE 16 |
| ... | ... |
@@ -22,10 +22,10 @@ |
| 22 | 22 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | 23 |
*/ |
| 24 | 24 |
|
| 25 |
-#include "dsputil.h" |
|
| 25 |
+#include "libavutil/common.h" |
|
| 26 |
+#include "libavutil/x86_cpu.h" |
|
| 27 |
+#include "libavcodec/dsputil.h" |
|
| 26 | 28 |
#include "dsputil_mmx.h" |
| 27 |
-#include "common.h" |
|
| 28 |
-#include "x86_cpu.h" |
|
| 29 | 29 |
|
| 30 | 30 |
/***************************************************************************** |
| 31 | 31 |
* |
| ... | ... |
@@ -22,16 +22,16 @@ |
| 22 | 22 |
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> |
| 23 | 23 |
*/ |
| 24 | 24 |
|
| 25 |
-#include "dsputil.h" |
|
| 25 |
+#include "libavutil/x86_cpu.h" |
|
| 26 |
+#include "libavcodec/dsputil.h" |
|
| 27 |
+#include "libavcodec/h263.h" |
|
| 28 |
+#include "libavcodec/mpegvideo.h" |
|
| 29 |
+#include "libavcodec/simple_idct.h" |
|
| 26 | 30 |
#include "dsputil_mmx.h" |
| 27 |
-#include "simple_idct.h" |
|
| 28 |
-#include "mpegvideo.h" |
|
| 29 |
-#include "x86_cpu.h" |
|
| 30 | 31 |
#include "mmx.h" |
| 31 | 32 |
#include "vp3dsp_mmx.h" |
| 32 | 33 |
#include "vp3dsp_sse2.h" |
| 33 | 34 |
#include "idct_xvid.h" |
| 34 |
-#include "h263.h" |
|
| 35 | 35 |
|
| 36 | 36 |
//#undef NDEBUG |
| 37 | 37 |
//#include <assert.h> |
| ... | ... |
@@ -22,10 +22,10 @@ |
| 22 | 22 |
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> |
| 23 | 23 |
*/ |
| 24 | 24 |
|
| 25 |
-#include "dsputil.h" |
|
| 25 |
+#include "libavutil/x86_cpu.h" |
|
| 26 |
+#include "libavcodec/dsputil.h" |
|
| 27 |
+#include "libavcodec/mpegvideo.h" |
|
| 26 | 28 |
#include "dsputil_mmx.h" |
| 27 |
-#include "mpegvideo.h" |
|
| 28 |
-#include "x86_cpu.h" |
|
| 29 | 29 |
|
| 30 | 30 |
|
| 31 | 31 |
static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size) |
| ... | ... |
@@ -29,8 +29,9 @@ |
| 29 | 29 |
* License along with FFmpeg; if not, write to the Free Software |
| 30 | 30 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 31 | 31 |
*/ |
| 32 |
-#include "common.h" |
|
| 33 |
-#include "dsputil.h" |
|
| 32 |
+ |
|
| 33 |
+#include "libavutil/common.h" |
|
| 34 |
+#include "libavcodec/dsputil.h" |
|
| 34 | 35 |
#include "mmx.h" |
| 35 | 36 |
|
| 36 | 37 |
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) |
| ... | ... |
@@ -19,8 +19,9 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
-#include "dsputil.h" |
|
| 23 |
-#include "x86_cpu.h" |
|
| 22 |
+ |
|
| 23 |
+#include "libavutil/x86_cpu.h" |
|
| 24 |
+#include "libavcodec/dsputil.h" |
|
| 24 | 25 |
|
| 25 | 26 |
static const int p1m1[2] __attribute__((aligned(8))) = |
| 26 | 27 |
{ 0, 1 << 31 };
|
| ... | ... |
@@ -19,8 +19,9 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
-#include "dsputil.h" |
|
| 23 |
-#include "x86_cpu.h" |
|
| 22 |
+ |
|
| 23 |
+#include "libavutil/x86_cpu.h" |
|
| 24 |
+#include "libavcodec/dsputil.h" |
|
| 24 | 25 |
|
| 25 | 26 |
static const int p1m1[2] __attribute__((aligned(8))) = |
| 26 | 27 |
{ 0, 1 << 31 };
|
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
-#include "dsputil.h" |
|
| 22 |
-#include "x86_cpu.h" |
|
| 21 |
+ |
|
| 22 |
+#include "libavutil/x86_cpu.h" |
|
| 23 |
+#include "libavcodec/dsputil.h" |
|
| 23 | 24 |
|
| 24 | 25 |
static const int p1p1p1m1[4] __attribute__((aligned(16))) = |
| 25 | 26 |
{ 0, 0, 0, 1 << 31 };
|
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/x86_cpu.h" |
|
| 22 | 23 |
#include "dsputil_mmx.h" |
| 23 |
-#include "x86_cpu.h" |
|
| 24 | 24 |
|
| 25 | 25 |
static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data) |
| 26 | 26 |
{
|
| ... | ... |
@@ -21,8 +21,9 @@ |
| 21 | 21 |
* License along with FFmpeg; if not, write to the Free Software |
| 22 | 22 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | 23 |
*/ |
| 24 |
-#include "dsputil.h" |
|
| 25 |
-#include "x86_cpu.h" |
|
| 24 |
+ |
|
| 25 |
+#include "libavutil/x86_cpu.h" |
|
| 26 |
+#include "libavcodec/dsputil.h" |
|
| 26 | 27 |
|
| 27 | 28 |
DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
|
| 28 | 29 |
0x0000000000000000ULL, |
| ... | ... |
@@ -22,11 +22,11 @@ |
| 22 | 22 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 23 | 23 |
*/ |
| 24 | 24 |
|
| 25 |
-#include "dsputil.h" |
|
| 25 |
+#include "libavutil/x86_cpu.h" |
|
| 26 |
+#include "libavcodec/avcodec.h" |
|
| 27 |
+#include "libavcodec/dsputil.h" |
|
| 28 |
+#include "libavcodec/mpegvideo.h" |
|
| 26 | 29 |
#include "dsputil_mmx.h" |
| 27 |
-#include "mpegvideo.h" |
|
| 28 |
-#include "avcodec.h" |
|
| 29 |
-#include "x86_cpu.h" |
|
| 30 | 30 |
|
| 31 | 31 |
extern uint16_t inv_zigzag_direct16[64]; |
| 32 | 32 |
|
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
-#include "dsputil.h" |
|
| 23 |
-#include "simple_idct.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/simple_idct.h" |
|
| 24 | 24 |
|
| 25 | 25 |
/* |
| 26 | 26 |
23170.475006 |
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
-#include "avcodec.h" |
|
| 23 |
-#include "snow.h" |
|
| 24 |
-#include "x86_cpu.h" |
|
| 22 |
+#include "libavutil/x86_cpu.h" |
|
| 23 |
+#include "libavcodec/avcodec.h" |
|
| 24 |
+#include "libavcodec/snow.h" |
|
| 25 | 25 |
|
| 26 | 26 |
void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
|
| 27 | 27 |
const int w2= (width+1)>>1; |
| ... | ... |
@@ -24,9 +24,9 @@ |
| 24 | 24 |
* OTHER DEALINGS IN THE SOFTWARE. |
| 25 | 25 |
*/ |
| 26 | 26 |
|
| 27 |
-#include "dsputil.h" |
|
| 27 |
+#include "libavutil/x86_cpu.h" |
|
| 28 |
+#include "libavcodec/dsputil.h" |
|
| 28 | 29 |
#include "dsputil_mmx.h" |
| 29 |
-#include "x86_cpu.h" |
|
| 30 | 30 |
|
| 31 | 31 |
/** Add rounder from mm7 to mm3 and pack result at destination */ |
| 32 | 32 |
#define NORMALIZE_MMX(SHIFT) \ |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
-#include "dsputil.h" |
|
| 23 |
-#include "mpegvideo.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/mpegvideo.h" |
|
| 24 | 24 |
|
| 25 | 25 |
#include <mlib_types.h> |
| 26 | 26 |
#include <mlib_status.h> |
| ... | ... |
@@ -30,8 +30,9 @@ |
| 30 | 30 |
* The 3 alphanumeric copyright notices are md5summed they are from the original |
| 31 | 31 |
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/ |
| 32 | 32 |
*/ |
| 33 |
+ |
|
| 34 |
+#include "libavutil/random.h" |
|
| 33 | 35 |
#include "avcodec.h" |
| 34 |
-#include "random.h" |
|
| 35 | 36 |
#include "dsputil.h" |
| 36 | 37 |
|
| 37 | 38 |
#define ALT_BITSTREAM_READER_LE |
| ... | ... |
@@ -21,11 +21,10 @@ |
| 21 | 21 |
#include <stdio.h> |
| 22 | 22 |
#include <stdlib.h> |
| 23 | 23 |
|
| 24 |
+#include "libavutil/bswap.h" |
|
| 25 |
+#include "libavutil/lzo.h" |
|
| 24 | 26 |
#include "avcodec.h" |
| 25 |
- |
|
| 26 |
-#include "bswap.h" |
|
| 27 | 27 |
#include "dsputil.h" |
| 28 |
-#include "lzo.h" |
|
| 29 | 28 |
#include "rtjpeg.h" |
| 30 | 29 |
|
| 31 | 30 |
typedef struct {
|
| ... | ... |
@@ -19,11 +19,11 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
-#include "dsputil.h" |
|
| 22 |
+#include "libavcodec/dsputil.h" |
|
| 23 |
+#include "libavcodec/snow.h" |
|
| 23 | 24 |
|
| 24 | 25 |
#include "gcc_fixes.h" |
| 25 | 26 |
#include "dsputil_altivec.h" |
| 26 |
-#include "snow.h" |
|
| 27 | 27 |
|
| 28 | 28 |
#undef NDEBUG |
| 29 | 29 |
#include <assert.h> |
| ... | ... |
@@ -25,8 +25,8 @@ |
| 25 | 25 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 26 | 26 |
*/ |
| 27 | 27 |
|
| 28 |
-#include "common.h" |
|
| 29 |
-#include "dsputil.h" |
|
| 28 |
+#include "libavutil/common.h" |
|
| 29 |
+#include "libavcodec/dsputil.h" |
|
| 30 | 30 |
#include "mmi.h" |
| 31 | 31 |
|
| 32 | 32 |
#define BITS_INV_ACC 5 // 4 or 5 for IEEE |
| ... | ... |
@@ -20,9 +20,9 @@ |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 | 22 |
|
| 23 |
-#include "dsputil.h" |
|
| 24 |
-#include "mpegvideo.h" |
|
| 25 |
-#include "avcodec.h" |
|
| 23 |
+#include "libavcodec/avcodec.h" |
|
| 24 |
+#include "libavcodec/dsputil.h" |
|
| 25 |
+#include "libavcodec/mpegvideo.h" |
|
| 26 | 26 |
|
| 27 | 27 |
static void dct_unquantize_h263_mmi(MpegEncContext *s, |
| 28 | 28 |
DCTELEM *block, int n, int qscale) |
| ... | ... |
@@ -18,7 +18,7 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
-#include "common.h" |
|
| 21 |
+#include "libavutil/common.h" |
|
| 22 | 22 |
#include "bitstream.h" |
| 23 | 23 |
#include "dsputil.h" |
| 24 | 24 |
#include "rtjpeg.h" |
| ... | ... |
@@ -20,8 +20,8 @@ |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 | 22 |
|
| 23 |
-#include "avcodec.h" |
|
| 24 |
-#include "dsputil.h" |
|
| 23 |
+#include "libavcodec/avcodec.h" |
|
| 24 |
+#include "libavcodec/dsputil.h" |
|
| 25 | 25 |
|
| 26 | 26 |
static void memzero_align8(void *dst,size_t size) |
| 27 | 27 |
{
|
| ... | ... |
@@ -20,7 +20,7 @@ |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 | 22 |
|
| 23 |
-#include "dsputil.h" |
|
| 23 |
+#include "libavcodec/dsputil.h" |
|
| 24 | 24 |
#define c1 1.38703984532214752434 /* sqrt(2)*cos(1*pi/16) */ |
| 25 | 25 |
#define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */ |
| 26 | 26 |
#define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */ |
| ... | ... |
@@ -25,11 +25,11 @@ |
| 25 | 25 |
* utils. |
| 26 | 26 |
*/ |
| 27 | 27 |
|
| 28 |
+#include "libavutil/integer.h" |
|
| 29 |
+#include "libavutil/crc.h" |
|
| 28 | 30 |
#include "avcodec.h" |
| 29 | 31 |
#include "dsputil.h" |
| 30 |
-#include "integer.h" |
|
| 31 | 32 |
#include "opt.h" |
| 32 |
-#include "crc.h" |
|
| 33 | 33 |
#include "imgconvert.h" |
| 34 | 34 |
#include <stdarg.h> |
| 35 | 35 |
#include <limits.h> |
| ... | ... |
@@ -17,8 +17,9 @@ |
| 17 | 17 |
* License along with FFmpeg; if not, write to the Free Software |
| 18 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 |
*/ |
| 20 |
-#include "avformat.h" |
|
| 20 |
+ |
|
| 21 | 21 |
#include "config.h" |
| 22 |
+#include "libavformat/avformat.h" |
|
| 22 | 23 |
|
| 23 | 24 |
#define REGISTER_MUXER(X,x) { \
|
| 24 | 25 |
extern AVOutputFormat x##_muxer; \ |
| ... | ... |
@@ -35,9 +35,9 @@ |
| 35 | 35 |
#include <sys/ioctl.h> |
| 36 | 36 |
#include <sys/time.h> |
| 37 | 37 |
|
| 38 |
-#include "log.h" |
|
| 39 |
-#include "avcodec.h" |
|
| 40 |
-#include "avformat.h" |
|
| 38 |
+#include "libavutil/log.h" |
|
| 39 |
+#include "libavcodec/avcodec.h" |
|
| 40 |
+#include "libavformat/avformat.h" |
|
| 41 | 41 |
|
| 42 | 42 |
#define AUDIO_BLOCK_SIZE 4096 |
| 43 | 43 |
|
| ... | ... |
@@ -23,7 +23,8 @@ |
| 23 | 23 |
* License along with FFmpeg; if not, write to the Free Software |
| 24 | 24 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 25 | 25 |
*/ |
| 26 |
-#include "avformat.h" |
|
| 26 |
+ |
|
| 27 |
+#include "libavformat/avformat.h" |
|
| 27 | 28 |
#if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H) |
| 28 | 29 |
# include <dev/bktr/ioctl_meteor.h> |
| 29 | 30 |
# include <dev/bktr/ioctl_bt848.h> |
| ... | ... |
@@ -29,12 +29,12 @@ |
| 29 | 29 |
#include <sys/time.h> |
| 30 | 30 |
#include <time.h> |
| 31 | 31 |
|
| 32 |
-#include "avformat.h" |
|
| 32 |
+#include "libavformat/avformat.h" |
|
| 33 | 33 |
|
| 34 | 34 |
#undef DV1394_DEBUG |
| 35 | 35 |
|
| 36 |
+#include "libavformat/dv.h" |
|
| 36 | 37 |
#include "dv1394.h" |
| 37 |
-#include "dv.h" |
|
| 38 | 38 |
|
| 39 | 39 |
struct dv1394_data {
|
| 40 | 40 |
int fd; |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavcodec/imgconvert.h" |
|
| 22 | 23 |
#include "avfilter.h" |
| 23 |
-#include "imgconvert.h" |
|
| 24 | 24 |
|
| 25 | 25 |
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */ |
| 26 | 26 |
void avfilter_default_free_video_buffer(AVFilterPic *pic) |
| ... | ... |
@@ -19,8 +19,9 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
+ |
|
| 23 |
+#include "libavcodec/bitstream.h" |
|
| 22 | 24 |
#include "avformat.h" |
| 23 |
-#include "bitstream.h" |
|
| 24 | 25 |
|
| 25 | 26 |
#define ADTS_HEADER_SIZE 7 |
| 26 | 27 |
|
| ... | ... |
@@ -18,10 +18,11 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/intfloat_readwrite.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
#include "raw.h" |
| 23 | 25 |
#include "riff.h" |
| 24 |
-#include "intfloat_readwrite.h" |
|
| 25 | 26 |
|
| 26 | 27 |
static const AVCodecTag codec_aiff_tags[] = {
|
| 27 | 28 |
{ CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') },
|
| ... | ... |
@@ -18,11 +18,12 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/common.h" |
|
| 23 |
+#include "libavcodec/mpegaudio.h" |
|
| 21 | 24 |
#include "avformat.h" |
| 22 | 25 |
#include "riff.h" |
| 23 |
-#include "mpegaudio.h" |
|
| 24 | 26 |
#include "asf.h" |
| 25 |
-#include "common.h" |
|
| 26 | 27 |
#include "asfcrypt.h" |
| 27 | 28 |
|
| 28 | 29 |
extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format); |
| ... | ... |
@@ -19,11 +19,12 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
-#include "common.h" |
|
| 23 |
-#include "intreadwrite.h" |
|
| 24 |
-#include "bswap.h" |
|
| 25 |
-#include "des.h" |
|
| 26 |
-#include "rc4.h" |
|
| 22 |
+ |
|
| 23 |
+#include "libavutil/common.h" |
|
| 24 |
+#include "libavutil/intreadwrite.h" |
|
| 25 |
+#include "libavutil/bswap.h" |
|
| 26 |
+#include "libavutil/des.h" |
|
| 27 |
+#include "libavutil/rc4.h" |
|
| 27 | 28 |
#include "asfcrypt.h" |
| 28 | 29 |
|
| 29 | 30 |
/** |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/avstring.h" |
|
| 23 |
+#include "libavcodec/opt.h" |
|
| 21 | 24 |
#include "avformat.h" |
| 22 |
-#include "avstring.h" |
|
| 23 |
-#include "opt.h" |
|
| 24 | 25 |
|
| 25 | 26 |
#if LIBAVFORMAT_VERSION_MAJOR >= 53 |
| 26 | 27 |
/** @name Logging context. */ |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/crc.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
#include "avio.h" |
| 23 |
-#include "crc.h" |
|
| 24 | 25 |
#include <stdarg.h> |
| 25 | 26 |
|
| 26 | 27 |
#define IO_BUFFER_SIZE 32768 |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/adler32.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "adler32.h" |
|
| 23 | 24 |
|
| 24 | 25 |
typedef struct CRCState {
|
| 25 | 26 |
uint32_t crcval; |
| ... | ... |
@@ -30,9 +30,9 @@ |
| 30 | 30 |
#include <time.h> |
| 31 | 31 |
#include <stdarg.h> |
| 32 | 32 |
#include "avformat.h" |
| 33 |
-#include "dvdata.h" |
|
| 33 |
+#include "libavcodec/dvdata.h" |
|
| 34 | 34 |
#include "dv.h" |
| 35 |
-#include "fifo.h" |
|
| 35 |
+#include "libavutil/fifo.h" |
|
| 36 | 36 |
|
| 37 | 37 |
struct DVMuxContext {
|
| 38 | 38 |
const DVprofile* sys; /* Current DV profile. E.g.: 525/60, 625/50 */ |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/avstring.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "avstring.h" |
|
| 23 | 24 |
#include <fcntl.h> |
| 24 | 25 |
#include <unistd.h> |
| 25 | 26 |
#include <sys/time.h> |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/adler32.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "adler32.h" |
|
| 23 | 24 |
|
| 24 | 25 |
static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
| 25 | 26 |
{
|
| ... | ... |
@@ -28,7 +28,7 @@ |
| 28 | 28 |
* Prototypes for interface to .so that implement a video processing hook |
| 29 | 29 |
*/ |
| 30 | 30 |
|
| 31 |
-#include "avcodec.h" |
|
| 31 |
+#include "libavcodec/avcodec.h" |
|
| 32 | 32 |
|
| 33 | 33 |
/* Function must be called 'Configure' */ |
| 34 | 34 |
typedef int (FrameHookConfigure)(void **ctxp, int argc, char *argv[]); |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/common.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "common.h" |
|
| 23 | 24 |
#include "gxf.h" |
| 24 | 25 |
|
| 25 | 26 |
typedef struct {
|
| ... | ... |
@@ -19,10 +19,10 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/fifo.h" |
|
| 22 | 23 |
#include "avformat.h" |
| 23 | 24 |
#include "gxf.h" |
| 24 | 25 |
#include "riff.h" |
| 25 |
-#include "fifo.h" |
|
| 26 | 26 |
|
| 27 | 27 |
#define GXF_AUDIO_PACKET_SIZE 65536 |
| 28 | 28 |
|
| ... | ... |
@@ -18,14 +18,14 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/base64.h" |
|
| 23 |
+#include "libavutil/avstring.h" |
|
| 21 | 24 |
#include "avformat.h" |
| 22 | 25 |
#include <unistd.h> |
| 23 | 26 |
#include "network.h" |
| 24 | 27 |
#include "os_support.h" |
| 25 | 28 |
|
| 26 |
-#include "base64.h" |
|
| 27 |
-#include "avstring.h" |
|
| 28 |
- |
|
| 29 | 29 |
/* XXX: POST protocol is not completely implemented because ffmpeg uses |
| 30 | 30 |
only a subset of it. */ |
| 31 | 31 |
|
| ... | ... |
@@ -19,8 +19,9 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
+ |
|
| 23 |
+#include "libavutil/avstring.h" |
|
| 22 | 24 |
#include "avformat.h" |
| 23 |
-#include "avstring.h" |
|
| 24 | 25 |
|
| 25 | 26 |
typedef struct {
|
| 26 | 27 |
int img_first; |
| ... | ... |
@@ -31,9 +31,9 @@ |
| 31 | 31 |
#include "avformat.h" |
| 32 | 32 |
/* For codec_get_id(). */ |
| 33 | 33 |
#include "riff.h" |
| 34 |
-#include "intfloat_readwrite.h" |
|
| 35 | 34 |
#include "matroska.h" |
| 36 | 35 |
#include "libavcodec/mpeg4audio.h" |
| 36 |
+#include "libavutil/intfloat_readwrite.h" |
|
| 37 | 37 |
#include "libavutil/lzo.h" |
| 38 | 38 |
|
| 39 | 39 |
typedef struct Track {
|
| ... | ... |
@@ -20,11 +20,11 @@ |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 | 22 |
#include "avformat.h" |
| 23 |
-#include "md5.h" |
|
| 24 | 23 |
#include "riff.h" |
| 25 |
-#include "xiph.h" |
|
| 26 | 24 |
#include "matroska.h" |
| 27 | 25 |
#include "avc.h" |
| 26 |
+#include "libavutil/md5.h" |
|
| 27 |
+#include "libavcodec/xiph.h" |
|
| 28 | 28 |
#include "libavcodec/mpeg4audio.h" |
| 29 | 29 |
|
| 30 | 30 |
typedef struct ebml_master {
|
| ... | ... |
@@ -18,10 +18,11 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/avstring.h" |
|
| 23 |
+#include "libavcodec/mpegaudio.h" |
|
| 24 |
+#include "libavcodec/mpegaudiodecheader.h" |
|
| 21 | 25 |
#include "avformat.h" |
| 22 |
-#include "mpegaudio.h" |
|
| 23 |
-#include "avstring.h" |
|
| 24 |
-#include "mpegaudiodecheader.h" |
|
| 25 | 26 |
|
| 26 | 27 |
#define ID3v2_HEADER_SIZE 10 |
| 27 | 28 |
#define ID3v1_TAG_SIZE 128 |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "bitstream.h" |
|
| 23 | 24 |
|
| 24 | 25 |
#define MPC_FRAMESIZE 1152 |
| 25 | 26 |
#define DELAY_FRAMES 32 |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 23 |
+#include "libavcodec/unary.h" |
|
| 21 | 24 |
#include "avformat.h" |
| 22 |
-#include "bitstream.h" |
|
| 23 |
-#include "unary.h" |
|
| 24 | 25 |
|
| 25 | 26 |
/// Two-byte MPC tag |
| 26 | 27 |
#define MKMPCTAG(a, b) (a | (b << 8)) |
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/fifo.h" |
|
| 23 |
+#include "libavcodec/bitstream.h" |
|
| 22 | 24 |
#include "avformat.h" |
| 23 |
-#include "bitstream.h" |
|
| 24 |
-#include "fifo.h" |
|
| 25 | 25 |
#include "mpeg.h" |
| 26 | 26 |
|
| 27 | 27 |
#define MAX_PAYLOAD_SIZE 4096 |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/crc.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "crc.h" |
|
| 23 | 24 |
#include "mpegts.h" |
| 24 | 25 |
|
| 25 | 26 |
//#define DEBUG_SI |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/crc.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "crc.h" |
|
| 23 | 24 |
#include "mpegts.h" |
| 24 | 25 |
|
| 25 | 26 |
/* write DVB SI sections */ |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/tree.h" |
|
| 22 | 23 |
#include "nut.h" |
| 23 |
-#include "tree.h" |
|
| 24 | 24 |
|
| 25 | 25 |
const AVCodecTag ff_nut_subtitle_tags[] = {
|
| 26 | 26 |
{ CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
|
| ... | ... |
@@ -23,10 +23,10 @@ |
| 23 | 23 |
#define FFMPEG_NUT_H |
| 24 | 24 |
|
| 25 | 25 |
//#include <limits.h> |
| 26 |
+//#include "libavutil/adler32.h" |
|
| 27 |
+//#include "libavcodec/mpegaudio.h" |
|
| 26 | 28 |
#include "avformat.h" |
| 27 |
-//#include "mpegaudio.h" |
|
| 28 | 29 |
#include "riff.h" |
| 29 |
-//#include "adler32.h" |
|
| 30 | 30 |
|
| 31 | 31 |
#define MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
|
| 32 | 32 |
#define STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
|
| ... | ... |
@@ -20,9 +20,9 @@ |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 | 22 |
|
| 23 |
-#include "tree.h" |
|
| 23 |
+#include "libavutil/avstring.h" |
|
| 24 |
+#include "libavutil/tree.h" |
|
| 24 | 25 |
#include "nut.h" |
| 25 |
-#include "avstring.h" |
|
| 26 | 26 |
|
| 27 | 27 |
#undef NDEBUG |
| 28 | 28 |
#include <assert.h> |
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/tree.h" |
|
| 23 |
+#include "libavcodec/mpegaudiodata.h" |
|
| 22 | 24 |
#include "nut.h" |
| 23 |
-#include "tree.h" |
|
| 24 |
-#include "mpegaudiodata.h" |
|
| 25 | 25 |
|
| 26 | 26 |
static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
|
| 27 | 27 |
int sample_rate= c->sample_rate; |
| ... | ... |
@@ -19,10 +19,10 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/crc.h" |
|
| 23 |
+#include "libavcodec/xiph.h" |
|
| 24 |
+#include "libavcodec/bytestream.h" |
|
| 22 | 25 |
#include "avformat.h" |
| 23 |
-#include "crc.h" |
|
| 24 |
-#include "xiph.h" |
|
| 25 |
-#include "bytestream.h" |
|
| 26 | 26 |
|
| 27 | 27 |
typedef struct {
|
| 28 | 28 |
int64_t duration; |
| ... | ... |
@@ -23,10 +23,10 @@ |
| 23 | 23 |
**/ |
| 24 | 24 |
|
| 25 | 25 |
#include <stdlib.h> |
| 26 |
+#include "libavutil/intreadwrite.h" |
|
| 27 |
+#include "libavcodec/bitstream.h" |
|
| 28 |
+#include "libavcodec/bytestream.h" |
|
| 26 | 29 |
#include "avformat.h" |
| 27 |
-#include "bitstream.h" |
|
| 28 |
-#include "bytestream.h" |
|
| 29 |
-#include "intreadwrite.h" |
|
| 30 | 30 |
#include "oggdec.h" |
| 31 | 31 |
#include "riff.h" |
| 32 | 32 |
|
| ... | ... |
@@ -23,12 +23,12 @@ |
| 23 | 23 |
**/ |
| 24 | 24 |
|
| 25 | 25 |
#include <stdlib.h> |
| 26 |
+#include "libavutil/bswap.h" |
|
| 27 |
+#include "libavutil/avstring.h" |
|
| 28 |
+#include "libavcodec/bitstream.h" |
|
| 29 |
+#include "libavcodec/bytestream.h" |
|
| 26 | 30 |
#include "avformat.h" |
| 27 |
-#include "bitstream.h" |
|
| 28 |
-#include "bytestream.h" |
|
| 29 |
-#include "bswap.h" |
|
| 30 | 31 |
#include "oggdec.h" |
| 31 |
-#include "avstring.h" |
|
| 32 | 32 |
|
| 33 | 33 |
static int speex_header(AVFormatContext *s, int idx) {
|
| 34 | 34 |
ogg_t *ogg = s->priv_data; |
| ... | ... |
@@ -23,12 +23,12 @@ |
| 23 | 23 |
**/ |
| 24 | 24 |
|
| 25 | 25 |
#include <stdlib.h> |
| 26 |
+#include "libavutil/avstring.h" |
|
| 27 |
+#include "libavutil/bswap.h" |
|
| 28 |
+#include "libavcodec/bitstream.h" |
|
| 29 |
+#include "libavcodec/bytestream.h" |
|
| 26 | 30 |
#include "avformat.h" |
| 27 |
-#include "bitstream.h" |
|
| 28 |
-#include "bytestream.h" |
|
| 29 |
-#include "bswap.h" |
|
| 30 | 31 |
#include "oggdec.h" |
| 31 |
-#include "avstring.h" |
|
| 32 | 32 |
|
| 33 | 33 |
extern int |
| 34 | 34 |
vorbis_comment(AVFormatContext * as, uint8_t *buf, int size) |
| ... | ... |
@@ -19,12 +19,13 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
+ |
|
| 23 |
+#include "libavutil/crc.h" |
|
| 24 |
+#include "libavcodec/ac3_parser.h" |
|
| 25 |
+#include "libavcodec/bitstream.h" |
|
| 26 |
+#include "libavcodec/bytestream.h" |
|
| 22 | 27 |
#include "avformat.h" |
| 23 |
-#include "ac3_parser.h" |
|
| 24 | 28 |
#include "raw.h" |
| 25 |
-#include "crc.h" |
|
| 26 |
-#include "bitstream.h" |
|
| 27 |
-#include "bytestream.h" |
|
| 28 | 29 |
|
| 29 | 30 |
#ifdef CONFIG_MUXERS |
| 30 | 31 |
/* simple formats */ |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavcodec/avcodec.h" |
|
| 22 | 23 |
#include "avformat.h" |
| 23 |
-#include "avcodec.h" |
|
| 24 | 24 |
#include "riff.h" |
| 25 | 25 |
|
| 26 | 26 |
/* Note: when encoding, the first matching tag is used, so order is |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/avstring.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
#include "rm.h" |
| 23 |
-#include "avstring.h" |
|
| 24 | 25 |
|
| 25 | 26 |
static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len) |
| 26 | 27 |
{
|
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "bitstream.h" |
|
| 23 | 24 |
|
| 24 | 25 |
#include <unistd.h> |
| 25 | 26 |
#include "network.h" |
| ... | ... |
@@ -36,9 +36,11 @@ |
| 36 | 36 |
* |
| 37 | 37 |
*/ |
| 38 | 38 |
|
| 39 |
+#include "libavutil/base64.h" |
|
| 40 |
+#include "libavutil/avstring.h" |
|
| 41 |
+#include "libavcodec/bitstream.h" |
|
| 39 | 42 |
#include "avformat.h" |
| 40 | 43 |
#include "mpegts.h" |
| 41 |
-#include "bitstream.h" |
|
| 42 | 44 |
|
| 43 | 45 |
#include <unistd.h> |
| 44 | 46 |
#include "network.h" |
| ... | ... |
@@ -46,8 +48,6 @@ |
| 46 | 46 |
|
| 47 | 47 |
#include "rtp_internal.h" |
| 48 | 48 |
#include "rtp_h264.h" |
| 49 |
-#include "base64.h" |
|
| 50 |
-#include "avstring.h" |
|
| 51 | 49 |
|
| 52 | 50 |
/** |
| 53 | 51 |
RTP/H264 specific private data. |
| ... | ... |
@@ -19,11 +19,11 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
+ |
|
| 23 |
+#include "libavcodec/mpegvideo.h" |
|
| 22 | 24 |
#include "avformat.h" |
| 23 | 25 |
#include "rtp_internal.h" |
| 24 | 26 |
|
| 25 |
-#include "mpegvideo.h" |
|
| 26 |
- |
|
| 27 | 27 |
/* NOTE: a single frame must be passed with sequence header if |
| 28 | 28 |
needed. XXX: use slices. */ |
| 29 | 29 |
void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size) |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
#include "mpegts.h" |
| 23 |
-#include "bitstream.h" |
|
| 24 | 25 |
|
| 25 | 26 |
#include <unistd.h> |
| 26 | 27 |
#include "network.h" |
| ... | ... |
@@ -18,9 +18,10 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
#include "mpegts.h" |
| 23 |
-#include "bitstream.h" |
|
| 24 | 25 |
|
| 25 | 26 |
#include <unistd.h> |
| 26 | 27 |
#include "network.h" |
| ... | ... |
@@ -18,12 +18,13 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavutil/avstring.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 | 24 |
|
| 23 | 25 |
#include <sys/time.h> |
| 24 | 26 |
#include <unistd.h> /* for select() prototype */ |
| 25 | 27 |
#include "network.h" |
| 26 |
-#include "avstring.h" |
|
| 27 | 28 |
#include "rtsp.h" |
| 28 | 29 |
|
| 29 | 30 |
#include "rtp_internal.h" |
| ... | ... |
@@ -18,10 +18,10 @@ |
| 18 | 18 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 |
*/ |
| 20 | 20 |
|
| 21 |
-#include "avstring.h" |
|
| 21 |
+#include "libavutil/avstring.h" |
|
| 22 |
+#include "libavutil/base64.h" |
|
| 22 | 23 |
#include "avformat.h" |
| 23 | 24 |
#include "avc.h" |
| 24 |
-#include "base64.h" |
|
| 25 | 25 |
#include "rtp.h" |
| 26 | 26 |
|
| 27 | 27 |
#ifdef CONFIG_RTP_MUXER |
| ... | ... |
@@ -23,10 +23,10 @@ |
| 23 | 23 |
* Based on documents from Game Audio Player and own research |
| 24 | 24 |
*/ |
| 25 | 25 |
|
| 26 |
+#include "libavutil/bswap.h" |
|
| 26 | 27 |
#include "avformat.h" |
| 27 | 28 |
#include "raw.h" |
| 28 | 29 |
#include "riff.h" |
| 29 |
-#include "bswap.h" |
|
| 30 | 30 |
|
| 31 | 31 |
/* if we don't know the size in advance */ |
| 32 | 32 |
#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) |
| ... | ... |
@@ -19,8 +19,9 @@ |
| 19 | 19 |
* License along with FFmpeg; if not, write to the Free Software |
| 20 | 20 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 21 |
*/ |
| 22 |
+ |
|
| 23 |
+#include "libavcodec/bitstream.h" |
|
| 22 | 24 |
#include "avformat.h" |
| 23 |
-#include "bitstream.h" |
|
| 24 | 25 |
#include "riff.h" /* for CodecTag */ |
| 25 | 26 |
|
| 26 | 27 |
/* should have a generic way to indicate probable size */ |
| ... | ... |
@@ -18,8 +18,9 @@ |
| 18 | 18 |
* License along with FFmpeg; if not, write to the Free Software |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 |
+ |
|
| 22 |
+#include "libavcodec/bitstream.h" |
|
| 21 | 23 |
#include "avformat.h" |
| 22 |
-#include "bitstream.h" |
|
| 23 | 24 |
|
| 24 | 25 |
typedef struct {
|
| 25 | 26 |
int totalframes, currentframe; |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
#include "avformat.h" |
| 22 |
-#include "opt.h" |
|
| 23 |
-#include "avstring.h" |
|
| 22 |
+#include "libavcodec/opt.h" |
|
| 23 |
+#include "libavutil/avstring.h" |
|
| 24 | 24 |
#include "riff.h" |
| 25 | 25 |
#include <sys/time.h> |
| 26 | 26 |
#include <time.h> |
| ... | ... |
@@ -19,8 +19,8 @@ |
| 19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 |
*/ |
| 21 | 21 |
|
| 22 |
+#include "libavutil/bswap.h" |
|
| 22 | 23 |
#include "avformat.h" |
| 23 |
-#include "bswap.h" |
|
| 24 | 24 |
|
| 25 | 25 |
// specs say that maximum block size is 1Mb |
| 26 | 26 |
#define WV_BLOCK_LIMIT 1047576 |
| ... | ... |
@@ -74,7 +74,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks |
| 74 | 74 |
//Changelog: use the Subversion log |
| 75 | 75 |
|
| 76 | 76 |
#include "config.h" |
| 77 |
-#include "avutil.h" |
|
| 77 |
+#include "libavutil/avutil.h" |
|
| 78 | 78 |
#include <inttypes.h> |
| 79 | 79 |
#include <stdio.h> |
| 80 | 80 |
#include <stdlib.h> |
| ... | ... |
@@ -31,10 +31,13 @@ |
| 31 | 31 |
#define M_PI 3.14159265358979323846 |
| 32 | 32 |
#endif |
| 33 | 33 |
|
| 34 |
-#include "avformat.h" |
|
| 35 |
-#include "swscale.h" |
|
| 34 |
+#include "libavformat/avformat.h" |
|
| 35 |
+#include "libswscale/swscale.h" |
|
| 36 | 36 |
|
| 37 | 37 |
#undef exit |
| 38 |
+#undef fprintf |
|
| 39 |
+#undef printf |
|
| 40 |
+#undef snprintf |
|
| 38 | 41 |
|
| 39 | 42 |
/* 5 seconds stream duration */ |
| 40 | 43 |
#define STREAM_DURATION 5.0 |
| ... | ... |
@@ -44,10 +44,10 @@ |
| 44 | 44 |
#include <stdio.h> |
| 45 | 45 |
#include <dirent.h> |
| 46 | 46 |
|
| 47 |
-#include "framehook.h" |
|
| 48 |
-#include "dsputil.h" |
|
| 49 |
-#include "avformat.h" |
|
| 50 |
-#include "swscale.h" |
|
| 47 |
+#include "libavformat/avformat.h" |
|
| 48 |
+#include "libavformat/framehook.h" |
|
| 49 |
+#include "libavcodec/dsputil.h" |
|
| 50 |
+#include "libswscale/swscale.h" |
|
| 51 | 51 |
|
| 52 | 52 |
static int sws_flags = SWS_BICUBIC; |
| 53 | 53 |
|
| ... | ... |
@@ -45,8 +45,8 @@ |
| 45 | 45 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 46 | 46 |
*/ |
| 47 | 47 |
|
| 48 |
-#include "framehook.h" |
|
| 49 |
-#include "swscale.h" |
|
| 48 |
+#include "libavformat/framehook.h" |
|
| 49 |
+#include "libswscale/swscale.h" |
|
| 50 | 50 |
|
| 51 | 51 |
#include <stdio.h> |
| 52 | 52 |
#include <stdlib.h> |
| ... | ... |
@@ -25,10 +25,10 @@ |
| 25 | 25 |
#include <sys/types.h> |
| 26 | 26 |
#include <sys/wait.h> |
| 27 | 27 |
#include <ctype.h> |
| 28 |
-#include "framehook.h" |
|
| 29 |
-#include "avformat.h" |
|
| 30 |
-#include "swscale.h" |
|
| 31 |
-#include "avstring.h" |
|
| 28 |
+#include "libavutil/avstring.h" |
|
| 29 |
+#include "libavformat/framehook.h" |
|
| 30 |
+#include "libavformat/avformat.h" |
|
| 31 |
+#include "libswscale/swscale.h" |
|
| 32 | 32 |
|
| 33 | 33 |
static int sws_flags = SWS_BICUBIC; |
| 34 | 34 |
|
| ... | ... |
@@ -58,12 +58,11 @@ |
| 58 | 58 |
#include <unistd.h> |
| 59 | 59 |
#include <stdarg.h> |
| 60 | 60 |
|
| 61 |
-#include "common.h" |
|
| 62 |
-#include "avformat.h" |
|
| 63 |
- |
|
| 64 |
-#include "framehook.h" |
|
| 61 |
+#include "libavutil/common.h" |
|
| 62 |
+#include "libavformat/avformat.h" |
|
| 63 |
+#include "libavformat/framehook.h" |
|
| 64 |
+#include "libswscale/swscale.h" |
|
| 65 | 65 |
#include "cmdutils.h" |
| 66 |
-#include "swscale.h" |
|
| 67 | 66 |
|
| 68 | 67 |
static int sws_flags = SWS_BICUBIC; |
| 69 | 68 |
|