Skip to content
Snippets Groups Projects
Commit 7080cbe2 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

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
...@@ -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 */
......
...@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment