Mercurial > libavformat.hg

changeset 3286:6f61c3b36632 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use full path for #includes from another directory.
author diego
date Fri, 09 May 2008 11:56:36 +0000
parents ccfd981fe0fa
children 8570df039c75
files adtsenc.c aiff.c asf.c asfcrypt.c avio.c aviobuf.c bethsoftvid.c crcenc.c dv.c dvenc.c file.c framecrcenc.c framehook.h gif.c gxf.c gxfenc.c http.c img2.c matroska.h matroskadec.c matroskaenc.c mov.c mp3.c mpc.c mpc8.c mpeg.h mpegenc.c mpegts.c mpegtsenc.c msnwc_tcp.c mtv.c mxf.c nut.c nut.h nutdec.c nutenc.c oggenc.c oggparseflac.c oggparseogm.c oggparsespeex.c oggparsetheora.c oggparsevorbis.c raw.c riff.c riff.h rmdec.c rpl.c rtp.c rtp.h rtp_h264.c rtp_internal.h rtp_mpv.c rtpdec.c rtpenc.c rtpproto.c rtsp.c sdp.c smacker.c sol.c swf.c tta.c utils.c wv.c
diffstat 63 files changed, 125 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/adtsenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/adtsenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define ADTS_HEADER_SIZE 7
 
--- a/aiff.c	Fri May 09 11:25:27 2008 +0000
+++ b/aiff.c	Fri May 09 11:56:36 2008 +0000
@@ -18,10 +18,11 @@
  * 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') },
--- a/asf.c	Fri May 09 11:25:27 2008 +0000
+++ b/asf.c	Fri May 09 11:56:36 2008 +0000
@@ -18,11 +18,12 @@
  * 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);
--- a/asfcrypt.c	Fri May 09 11:25:27 2008 +0000
+++ b/asfcrypt.c	Fri May 09 11:56:36 2008 +0000
@@ -19,11 +19,12 @@
  * 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"
 
 /**
--- a/avio.c	Fri May 09 11:25:27 2008 +0000
+++ b/avio.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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. */
--- a/aviobuf.c	Fri May 09 11:25:27 2008 +0000
+++ b/aviobuf.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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
--- a/bethsoftvid.c	Fri May 09 11:25:27 2008 +0000
+++ b/bethsoftvid.c	Fri May 09 11:56:36 2008 +0000
@@ -28,7 +28,7 @@
  */
 
 #include "avformat.h"
-#include "bethsoftvideo.h"
+#include "libavcodec/bethsoftvideo.h"
 
 typedef struct BVID_DemuxContext
 {
--- a/crcenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/crcenc.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 typedef struct CRCState {
     uint32_t crcval;
--- a/dv.c	Fri May 09 11:25:27 2008 +0000
+++ b/dv.c	Fri May 09 11:56:36 2008 +0000
@@ -29,7 +29,7 @@
  */
 #include <time.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
 
 struct DVDemuxContext {
--- a/dvenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/dvenc.c	Fri May 09 11:56:36 2008 +0000
@@ -30,9 +30,9 @@
 #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 */
--- a/file.c	Fri May 09 11:25:27 2008 +0000
+++ b/file.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
--- a/framecrcenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/framecrcenc.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
--- a/framehook.h	Fri May 09 11:25:27 2008 +0000
+++ b/framehook.h	Fri May 09 11:56:36 2008 +0000
@@ -28,7 +28,7 @@
  * 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[]);
--- a/gif.c	Fri May 09 11:25:27 2008 +0000
+++ b/gif.c	Fri May 09 11:56:36 2008 +0000
@@ -40,7 +40,7 @@
  */
 
 #include "avformat.h"
-#include "bitstream.h"
+#include "libavcodec/bitstream.h"
 
 /* bitstream minipacket size */
 #define GIF_CHUNKS 100
--- a/gxf.c	Fri May 09 11:25:27 2008 +0000
+++ b/gxf.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/common.h"
 #include "avformat.h"
-#include "common.h"
 #include "gxf.h"
 
 typedef struct {
--- a/gxfenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/gxfenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,10 +19,10 @@
  * 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
 
--- a/http.c	Fri May 09 11:25:27 2008 +0000
+++ b/http.c	Fri May 09 11:56:36 2008 +0000
@@ -18,14 +18,14 @@
  * 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. */
 
--- a/img2.c	Fri May 09 11:25:27 2008 +0000
+++ b/img2.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 typedef struct {
     int img_first;
--- a/matroska.h	Fri May 09 11:25:27 2008 +0000
+++ b/matroska.h	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATROSKA_H
 #define FFMPEG_MATROSKA_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 /* EBML version supported */
 #define EBML_VERSION 1
--- a/matroskadec.c	Fri May 09 11:25:27 2008 +0000
+++ b/matroskadec.c	Fri May 09 11:56:36 2008 +0000
@@ -31,9 +31,9 @@
 #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 {
--- a/matroskaenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/matroskaenc.c	Fri May 09 11:56:36 2008 +0000
@@ -20,11 +20,11 @@
  */
 
 #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 {
--- a/mov.c	Fri May 09 11:25:27 2008 +0000
+++ b/mov.c	Fri May 09 11:56:36 2008 +0000
@@ -27,8 +27,8 @@
 #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>
--- a/mp3.c	Fri May 09 11:25:27 2008 +0000
+++ b/mp3.c	Fri May 09 11:56:36 2008 +0000
@@ -18,10 +18,11 @@
  * 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
--- a/mpc.c	Fri May 09 11:25:27 2008 +0000
+++ b/mpc.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define MPC_FRAMESIZE  1152
 #define DELAY_FRAMES   32
--- a/mpc8.c	Fri May 09 11:25:27 2008 +0000
+++ b/mpc8.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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))
--- a/mpeg.h	Fri May 09 11:25:27 2008 +0000
+++ b/mpeg.h	Fri May 09 11:56:36 2008 +0000
@@ -23,7 +23,7 @@
 #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)
--- a/mpegenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/mpegenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,9 +19,9 @@
  * 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
--- a/mpegts.c	Fri May 09 11:25:27 2008 +0000
+++ b/mpegts.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 //#define DEBUG_SI
--- a/mpegtsenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/mpegtsenc.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 /* write DVB SI sections */
--- a/msnwc_tcp.c	Fri May 09 11:25:27 2008 +0000
+++ b/msnwc_tcp.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,8 @@
  * 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
 
--- a/mtv.c	Fri May 09 11:25:27 2008 +0000
+++ b/mtv.c	Fri May 09 11:56:36 2008 +0000
@@ -24,8 +24,8 @@
  * MTV demuxer.
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 #define MTV_ASUBCHUNK_DATA_SIZE 500
 #define MTV_HEADER_SIZE 512
--- a/mxf.c	Fri May 09 11:25:27 2008 +0000
+++ b/mxf.c	Fri May 09 11:56:36 2008 +0000
@@ -45,9 +45,9 @@
 
 //#define DEBUG
 
+#include "libavutil/aes.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "aes.h"
-#include "bytestream.h"
 
 typedef uint8_t UID[16];
 
--- a/nut.c	Fri May 09 11:25:27 2008 +0000
+++ b/nut.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * 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') },
--- a/nut.h	Fri May 09 11:25:27 2008 +0000
+++ b/nut.h	Fri May 09 11:56:36 2008 +0000
@@ -23,10 +23,10 @@
 #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))
--- a/nutdec.c	Fri May 09 11:25:27 2008 +0000
+++ b/nutdec.c	Fri May 09 11:56:36 2008 +0000
@@ -20,9 +20,9 @@
  * 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>
--- a/nutenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/nutenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,9 +19,9 @@
  * 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;
--- a/oggenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,10 +19,10 @@
  * 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;
--- a/oggparseflac.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggparseflac.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  */
 
 #include <stdlib.h>
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "oggdec.h"
 
 #define FLAC_STREAMINFO_SIZE 0x22
--- a/oggparseogm.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggparseogm.c	Fri May 09 11:56:36 2008 +0000
@@ -23,10 +23,10 @@
 **/
 
 #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"
 
--- a/oggparsespeex.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggparsespeex.c	Fri May 09 11:56:36 2008 +0000
@@ -23,12 +23,12 @@
 **/
 
 #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;
--- a/oggparsetheora.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggparsetheora.c	Fri May 09 11:56:36 2008 +0000
@@ -23,9 +23,9 @@
 **/
 
 #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 {
--- a/oggparsevorbis.c	Fri May 09 11:25:27 2008 +0000
+++ b/oggparsevorbis.c	Fri May 09 11:56:36 2008 +0000
@@ -23,12 +23,12 @@
 **/
 
 #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)
--- a/raw.c	Fri May 09 11:25:27 2008 +0000
+++ b/raw.c	Fri May 09 11:56:36 2008 +0000
@@ -19,12 +19,13 @@
  * 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 */
--- a/riff.c	Fri May 09 11:25:27 2008 +0000
+++ b/riff.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * 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
--- a/riff.h	Fri May 09 11:25:27 2008 +0000
+++ b/riff.h	Fri May 09 11:56:36 2008 +0000
@@ -28,7 +28,7 @@
 #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);
--- a/rmdec.c	Fri May 09 11:25:27 2008 +0000
+++ b/rmdec.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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)
 {
--- a/rpl.c	Fri May 09 11:25:27 2008 +0000
+++ b/rpl.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * 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"
--- a/rtp.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtp.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
--- a/rtp.h	Fri May 09 11:25:27 2008 +0000
+++ b/rtp.h	Fri May 09 11:56:36 2008 +0000
@@ -21,7 +21,7 @@
 #ifndef FFMPEG_RTP_H
 #define FFMPEG_RTP_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avformat.h"
 
 #define RTP_MIN_PACKET_LENGTH 12
--- a/rtp_h264.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtp_h264.c	Fri May 09 11:56:36 2008 +0000
@@ -36,9 +36,11 @@
  *
  */
 
+#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"
@@ -46,8 +48,6 @@
 
 #include "rtp_internal.h"
 #include "rtp_h264.h"
-#include "base64.h"
-#include "avstring.h"
 
 /**
     RTP/H264 specific private data.
--- a/rtp_internal.h	Fri May 09 11:25:27 2008 +0000
+++ b/rtp_internal.h	Fri May 09 11:56:36 2008 +0000
@@ -24,7 +24,7 @@
 #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...
--- a/rtp_mpv.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtp_mpv.c	Fri May 09 11:56:36 2008 +0000
@@ -19,11 +19,11 @@
  * 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)
--- a/rtpdec.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtpdec.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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"
--- a/rtpenc.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtpenc.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,10 @@
  * 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"
--- a/rtpproto.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtpproto.c	Fri May 09 11:56:36 2008 +0000
@@ -24,8 +24,8 @@
  * RTP protocol
  */
 
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 #include <unistd.h>
 #include <stdarg.h>
--- a/rtsp.c	Fri May 09 11:25:27 2008 +0000
+++ b/rtsp.c	Fri May 09 11:56:36 2008 +0000
@@ -18,12 +18,13 @@
  * 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"
--- a/sdp.c	Fri May 09 11:25:27 2008 +0000
+++ b/sdp.c	Fri May 09 11:56:36 2008 +0000
@@ -18,10 +18,10 @@
  * 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
--- a/smacker.c	Fri May 09 11:25:27 2008 +0000
+++ b/smacker.c	Fri May 09 11:56:36 2008 +0000
@@ -23,9 +23,9 @@
  * 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
--- a/sol.c	Fri May 09 11:25:27 2008 +0000
+++ b/sol.c	Fri May 09 11:56:36 2008 +0000
@@ -23,10 +23,10 @@
  * 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))
--- a/swf.c	Fri May 09 11:25:27 2008 +0000
+++ b/swf.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */
--- a/tta.c	Fri May 09 11:25:27 2008 +0000
+++ b/tta.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 typedef struct {
     int totalframes, currentframe;
--- a/utils.c	Fri May 09 11:25:27 2008 +0000
+++ b/utils.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * 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>
--- a/wv.c	Fri May 09 11:25:27 2008 +0000
+++ b/wv.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * 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