Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
90f7e617
Commit
90f7e617
authored
Aug 08, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swf: Move shared table out of the header file
parent
2804ba6a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
10 deletions
+35
-10
Makefile
libavformat/Makefile
+3
-3
swf.c
libavformat/swf.c
+29
-0
swf.h
libavformat/swf.h
+1
-5
swfdec.c
libavformat/swfdec.c
+1
-1
swfenc.c
libavformat/swfenc.c
+1
-1
No files found.
libavformat/Makefile
View file @
90f7e617
...
...
@@ -47,7 +47,7 @@ OBJS-$(CONFIG_AU_MUXER) += au.o
OBJS-$(CONFIG_AVI_DEMUXER)
+=
avidec.o
OBJS-$(CONFIG_AVI_MUXER)
+=
avienc.o
OBJS-$(CONFIG_AVISYNTH)
+=
avisynth.o
OBJS-$(CONFIG_AVM2_MUXER)
+=
swfenc.o
OBJS-$(CONFIG_AVM2_MUXER)
+=
swfenc.o
swf.o
OBJS-$(CONFIG_AVS_DEMUXER)
+=
avs.o
vocdec.o
voc.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)
+=
bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER)
+=
bfi.o
...
...
@@ -299,8 +299,8 @@ OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o spdifenc.o
OBJS-$(CONFIG_SRT_DEMUXER)
+=
srtdec.o
OBJS-$(CONFIG_SRT_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_STR_DEMUXER)
+=
psxstr.o
OBJS-$(CONFIG_SWF_DEMUXER)
+=
swfdec.o
OBJS-$(CONFIG_SWF_MUXER)
+=
swfenc.o
OBJS-$(CONFIG_SWF_DEMUXER)
+=
swfdec.o
swf.o
OBJS-$(CONFIG_SWF_MUXER)
+=
swfenc.o
swf.o
OBJS-$(CONFIG_THP_DEMUXER)
+=
thp.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)
+=
tiertexseq.o
OBJS-$(CONFIG_TMV_DEMUXER)
+=
tmv.o
...
...
libavformat/swf.c
0 → 100644
View file @
90f7e617
/*
* Flash Compatible Streaming Format
* Copyright (c) 2000 Fabrice Bellard
* Copyright (c) 2003 Tinic Uro
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "internal.h"
const
AVCodecTag
ff_swf_codec_tags
[]
=
{
{
CODEC_ID_FLV1
,
0x02
},
{
CODEC_ID_VP6F
,
0x04
},
{
CODEC_ID_NONE
,
0
},
};
libavformat/swf.h
View file @
90f7e617
...
...
@@ -78,10 +78,6 @@ typedef struct {
AVCodecContext
*
audio_enc
,
*
video_enc
;
}
SWFContext
;
static
const
AVCodecTag
swf_codec_tags
[]
=
{
{
AV_CODEC_ID_FLV1
,
0x02
},
{
AV_CODEC_ID_VP6F
,
0x04
},
{
AV_CODEC_ID_NONE
,
0
},
};
extern
const
AVCodecTag
ff_swf_codec_tags
[];
#endif
/* AVFORMAT_SWF_H */
libavformat/swfdec.c
View file @
90f7e617
...
...
@@ -120,7 +120,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
return
-
1
;
vst
->
id
=
ch_id
;
vst
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
vst
->
codec
->
codec_id
=
ff_codec_get_id
(
swf_codec_tags
,
avio_r8
(
pb
));
vst
->
codec
->
codec_id
=
ff_codec_get_id
(
ff_
swf_codec_tags
,
avio_r8
(
pb
));
avpriv_set_pts_info
(
vst
,
16
,
256
,
swf
->
frame_rate
);
len
-=
8
;
}
else
if
(
tag
==
TAG_STREAMHEAD
||
tag
==
TAG_STREAMHEAD2
)
{
...
...
libavformat/swfenc.c
View file @
90f7e617
...
...
@@ -347,7 +347,7 @@ static int swf_write_video(AVFormatContext *s,
avio_wl16
(
pb
,
enc
->
width
);
avio_wl16
(
pb
,
enc
->
height
);
avio_w8
(
pb
,
0
);
avio_w8
(
pb
,
ff_codec_get_tag
(
swf_codec_tags
,
enc
->
codec_id
));
avio_w8
(
pb
,
ff_codec_get_tag
(
ff_swf_codec_tags
,
enc
->
codec_id
));
put_swf_end_tag
(
s
);
/* place the video object for the first time */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment