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
7080cbe2
Commit
7080cbe2
authored
16 years ago
by
Baptiste Coudurier
Browse files
Options
Downloads
Patches
Plain Diff
pass extradata through ffm
Originally committed as revision 13721 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
d8b1dffb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/ffmdec.c
+7
-1
7 additions, 1 deletion
libavformat/ffmdec.c
libavformat/ffmenc.c
+4
-0
4 additions, 0 deletions
libavformat/ffmenc.c
with
11 additions
and
1 deletion
libavformat/ffmdec.c
+
7
−
1
View file @
7080cbe2
...
@@ -320,7 +320,13 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
...
@@ -320,7 +320,13 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
default:
default:
goto
fail
;
goto
fail
;
}
}
if
(
codec
->
flags
&
CODEC_FLAG_GLOBAL_HEADER
)
{
codec
->
extradata_size
=
get_be32
(
pb
);
codec
->
extradata
=
av_malloc
(
codec
->
extradata_size
);
if
(
!
codec
->
extradata
)
return
AVERROR
(
ENOMEM
);
get_buffer
(
pb
,
codec
->
extradata
,
codec
->
extradata_size
);
}
}
}
/* get until end of block reached */
/* get until end of block reached */
...
...
This diff is collapsed.
Click to expand it.
libavformat/ffmenc.c
+
4
−
0
View file @
7080cbe2
...
@@ -168,6 +168,10 @@ static int ffm_write_header(AVFormatContext *s)
...
@@ -168,6 +168,10 @@ static int ffm_write_header(AVFormatContext *s)
default:
default:
return
-
1
;
return
-
1
;
}
}
if
(
codec
->
flags
&
CODEC_FLAG_GLOBAL_HEADER
)
{
put_be32
(
pb
,
codec
->
extradata_size
);
put_buffer
(
pb
,
codec
->
extradata
,
codec
->
extradata_size
);
}
}
}
/* flush until end of block reached */
/* flush until end of block reached */
...
...
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