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
15c71dfd
Commit
15c71dfd
authored
Aug 15, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swf(dec): replace CODEC_ID with AV_CODEC_ID
parent
e0aa5e77
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
swf.c
libavformat/swf.c
+3
-3
swfdec.c
libavformat/swfdec.c
+6
-6
No files found.
libavformat/swf.c
View file @
15c71dfd
...
...
@@ -23,7 +23,7 @@
#include "internal.h"
const
AVCodecTag
ff_swf_codec_tags
[]
=
{
{
CODEC_ID_FLV1
,
0x02
},
{
CODEC_ID_VP6F
,
0x04
},
{
CODEC_ID_NONE
,
0
},
{
AV_
CODEC_ID_FLV1
,
0x02
},
{
AV_
CODEC_ID_VP6F
,
0x04
},
{
AV_
CODEC_ID_NONE
,
0
},
};
libavformat/swfdec.c
View file @
15c71dfd
...
...
@@ -24,12 +24,12 @@
#include "swf.h"
static
const
AVCodecTag
swf_audio_codec_tags
[]
=
{
{
CODEC_ID_PCM_S16LE
,
0x00
},
{
CODEC_ID_ADPCM_SWF
,
0x01
},
{
CODEC_ID_MP3
,
0x02
},
{
CODEC_ID_PCM_S16LE
,
0x03
},
// { CODEC_ID_NELLYMOSER, 0x06 },
{
CODEC_ID_NONE
,
0
},
{
AV_
CODEC_ID_PCM_S16LE
,
0x00
},
{
AV_
CODEC_ID_ADPCM_SWF
,
0x01
},
{
AV_
CODEC_ID_MP3
,
0x02
},
{
AV_
CODEC_ID_PCM_S16LE
,
0x03
},
// {
AV_
CODEC_ID_NELLYMOSER, 0x06 },
{
AV_
CODEC_ID_NONE
,
0
},
};
static
int
get_swf_tag
(
AVIOContext
*
pb
,
int
*
len_ptr
)
...
...
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