diff options
| author | zhentan feng <spyfeng@gmail.com> | 2011-05-01 21:12:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-01 21:12:02 +0200 |
| commit | 5ab826c165916a301ee748ee5a1d68cf788d5d2f (patch) | |
| tree | 652e757f78322bca14738e6685e61a8ecdff0481 /libavformat/wtvdec.c | |
| parent | 80a330679f5916a868227fabcecc4889cc402a61 (diff) | |
| download | android_external_ffmpeg-5ab826c165916a301ee748ee5a1d68cf788d5d2f.tar.gz android_external_ffmpeg-5ab826c165916a301ee748ee5a1d68cf788d5d2f.tar.bz2 android_external_ffmpeg-5ab826c165916a301ee748ee5a1d68cf788d5d2f.zip | |
WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file wtv.h and wtv.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvdec.c')
| -rw-r--r-- | libavformat/wtvdec.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 795ea39bf9..f2f76dbe33 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -29,8 +29,7 @@ #include "libavutil/intfloat_readwrite.h" #include "avformat.h" #include "internal.h" -#include "riff.h" -#include "asf.h" +#include "wtv.h" #include "mpegts.h" #include <strings.h> @@ -47,10 +46,6 @@ * */ -#define WTV_SECTOR_BITS 12 -#define WTV_SECTOR_SIZE (1 << WTV_SECTOR_BITS) -#define WTV_BIGSECTOR_BITS 18 - typedef struct { AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */ @@ -241,9 +236,6 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int return pb; } -static const ff_asf_guid dir_entry_guid = - {0x92,0xB7,0x74,0x91,0x59,0x70,0x70,0x44,0x88,0xDF,0x06,0x3B,0x82,0xCC,0x21,0x3D}; - /** * Open file using filename * @param[in] buf directory buffer @@ -324,16 +316,8 @@ typedef struct { } WtvContext; /* WTV GUIDs */ -static const ff_asf_guid wtv_guid = - {0xB7,0xD8,0x00,0x20,0x37,0x49,0xDA,0x11,0xA6,0x4E,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; static const ff_asf_guid metadata_guid = {0x5A,0xFE,0xD7,0x6D,0xC8,0x1D,0x8F,0x4A,0x99,0x22,0xFA,0xB1,0x1C,0x38,0x14,0x53}; -static const ff_asf_guid timestamp_guid = - {0x5B,0x05,0xE6,0x1B,0x97,0xA9,0x49,0x43,0x88,0x17,0x1A,0x65,0x5A,0x29,0x8A,0x97}; -static const ff_asf_guid data_guid = - {0x95,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; -static const ff_asf_guid stream_guid = - {0xED,0xA4,0x13,0x23,0x2D,0xBF,0x4F,0x45,0xAD,0x8A,0xD9,0x5B,0xA7,0xF9,0x1F,0xEE}; static const ff_asf_guid stream2_guid = {0xA2,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; static const ff_asf_guid EVENTID_SubtitleSpanningEvent = @@ -358,10 +342,6 @@ static const ff_asf_guid EVENTID_AudioTypeSpanningEvent = /* Windows media GUIDs */ /* Media types */ -static const ff_asf_guid mediatype_audio = - {'a','u','d','s',FF_MEDIASUBTYPE_BASE_GUID}; -static const ff_asf_guid mediatype_video = - {'v','i','d','s',FF_MEDIASUBTYPE_BASE_GUID}; static const ff_asf_guid mediasubtype_mpeg1payload = {0x81,0xEB,0x36,0xE4,0x4F,0x52,0xCE,0x11,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70}; static const ff_asf_guid mediatype_mpeg2_sections = @@ -392,13 +372,6 @@ static const ff_asf_guid format_videoinfo2 = {0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA}; static const ff_asf_guid format_mpeg2_video = {0xE3,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}; -static const ff_asf_guid format_none = - {0xD6,0x17,0x64,0x0F,0x18,0xC3,0xD0,0x11,0xA4,0x3F,0x00,0xA0,0xC9,0x22,0x31,0x96}; - -static const AVCodecGuid video_guids[] = { - {CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, - {CODEC_ID_NONE} -}; static int read_probe(AVProbeData *p) { |