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

Update ffserver to include all basic x264 parameters in .ffm files. 

Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jason Garrett-Glaser 2009-11-24 15:54:17 +00:00
parent 096c87f667
commit d2b34efe22
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/ffmdec.c
View File

@ -336,6 +336,19 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
codec->codec_tag = get_be32(pb);
codec->thread_count = get_byte(pb);
codec->coder_type = get_be32(pb);
codec->me_cmp = get_be32(pb);
codec->partitions = get_be32(pb);
codec->me_subpel_quality = get_be32(pb);
codec->me_range = get_be32(pb);
codec->keyint_min = get_be32(pb);
codec->scenechange_threshold = get_be32(pb);
codec->b_frame_strategy = get_be32(pb);
codec->qcompress = av_int2dbl(get_be64(pb));
codec->qblur = av_int2dbl(get_be64(pb));
codec->max_qdiff = get_be32(pb);
codec->refs = get_be32(pb);
codec->directpred = get_be32(pb);
break;
case CODEC_TYPE_AUDIO:
codec->sample_rate = get_be32(pb);

13
libavformat/ffmenc.c
View File

@ -154,6 +154,19 @@ static int ffm_write_header(AVFormatContext *s)
put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
put_be32(pb, codec->codec_tag);
put_byte(pb, codec->thread_count);
put_be32(pb, codec->coder_type);
put_be32(pb, codec->me_cmp);
put_be32(pb, codec->partitions);
put_be32(pb, codec->me_subpel_quality);
put_be32(pb, codec->me_range);
put_be32(pb, codec->keyint_min);
put_be32(pb, codec->scenechange_threshold);
put_be32(pb, codec->b_frame_strategy);
put_be64(pb, av_dbl2int(codec->qcompress));
put_be64(pb, av_dbl2int(codec->qblur));
put_be32(pb, codec->max_qdiff);
put_be32(pb, codec->refs);
put_be32(pb, codec->directpred);
break;
case CODEC_TYPE_AUDIO:
put_be32(pb, codec->sample_rate);