RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/ffmenc: Replace some st->codec use by codecpar 

Note, this temporarly drops the ability to set ffmpeg encoder debug and flags2 via ffserver.conf

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-12-01 16:00:44 +01:00
parent 7d1b1b660b
commit b7d94c19cd
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/ffmenc.c
View File

@ -224,6 +224,7 @@ static int ffm_write_header(AVFormatContext *s)
AVStream *st; AVStream *st;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecContext *codec; AVCodecContext *codec;
AVCodecParameters *codecpar;
int bit_rate, i, ret; int bit_rate, i, ret;
if ((ret = ff_parse_creation_time_metadata(s, &ffm->start_time, 0)) < 0) if ((ret = ff_parse_creation_time_metadata(s, &ffm->start_time, 0)) < 0)
@ -243,7 +244,7 @@ static int ffm_write_header(AVFormatContext *s)
bit_rate = 0; bit_rate = 0;
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
st = s->streams[i]; st = s->streams[i];
bit_rate += st->codec->bit_rate; bit_rate += st->codecpar->bit_rate;
} }
avio_wb32(pb, bit_rate); avio_wb32(pb, bit_rate);
@ -257,20 +258,21 @@ static int ffm_write_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
codec = st->codec; codec = st->codec;
codecpar = st->codecpar;
/* generic info */ /* generic info */
avio_wb32(pb, codec->codec_id); avio_wb32(pb, codecpar->codec_id);
avio_w8(pb, codec->codec_type); avio_w8(pb, codecpar->codec_type);
avio_wb32(pb, codec->bit_rate); avio_wb32(pb, codecpar->bit_rate);
avio_wb32(pb, codec->flags); avio_wb32(pb, codecpar->extradata_size ? AV_CODEC_FLAG_GLOBAL_HEADER : 0);
avio_wb32(pb, codec->flags2); avio_wb32(pb, 0); // flags2
avio_wb32(pb, codec->debug); avio_wb32(pb, 0); // debug
if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { if (codecpar->extradata_size) {
avio_wb32(pb, codec->extradata_size); avio_wb32(pb, codecpar->extradata_size);
avio_write(pb, codec->extradata, codec->extradata_size); avio_write(pb, codecpar->extradata, codecpar->extradata_size);
} }
write_header_chunk(s->pb, pb, MKBETAG('C', 'O', 'M', 'M')); write_header_chunk(s->pb, pb, MKBETAG('C', 'O', 'M', 'M'));
/* specific info */ /* specific info */
switch(codec->codec_type) { switch(codecpar->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (st->recommended_encoder_configuration) { if (st->recommended_encoder_configuration) {
av_log(NULL, AV_LOG_DEBUG, "writing recommended configuration: %s\n", av_log(NULL, AV_LOG_DEBUG, "writing recommended configuration: %s\n",