Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
5c1844ab
Commit
5c1844ab
authored
18 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
fix msmpeg4v3 tag in asf
Originally committed as revision 7606 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
d65b8230
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/asf-enc.c
+0
-1
0 additions, 1 deletion
libavformat/asf-enc.c
tests/libav.regression.ref
+1
-1
1 addition, 1 deletion
tests/libav.regression.ref
with
1 addition
and
2 deletions
libavformat/asf-enc.c
+
0
−
1
View file @
5c1844ab
...
...
@@ -190,7 +190,6 @@
static
const
AVCodecTag
codec_asf_bmp_tags
[]
=
{
{
CODEC_ID_MPEG4
,
MKTAG
(
'M'
,
'P'
,
'4'
,
'S'
)
},
{
CODEC_ID_MPEG4
,
MKTAG
(
'M'
,
'4'
,
'S'
,
'2'
)
},
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'D'
,
'I'
,
'V'
,
'3'
)
},
{
CODEC_ID_MSMPEG4V3
,
MKTAG
(
'M'
,
'P'
,
'4'
,
'3'
)
},
{
CODEC_ID_NONE
,
0
},
};
...
...
This diff is collapsed.
Click to expand it.
tests/libav.regression.ref
+
1
−
1
View file @
5c1844ab
...
...
@@ -2,7 +2,7 @@ ffmpeg regression test
8a0536ccfe36f4fff408b3327d33e1dd *./data/b-libav.avi
340344 ./data/b-libav.avi
./data/b-libav.avi CRC=0x400c29e9
85caa242a36abeab85a27c82ba73cc28
*./data/b-libav.asf
a46c4f3fc33587cbb644363066281424
*./data/b-libav.asf
339767 ./data/b-libav.asf
./data/b-libav.asf CRC=0x74113749
1ad618e9fd318eb3483270cf9b9b3f43 *./data/b-libav.rm
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment