diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-11-24 15:54:17 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-11-24 15:54:17 +0000 |
| commit | d2b34efe225e15bb82793ce166c21af9ab964a5e (patch) | |
| tree | bf5c0f22306cbdb013531ee8d0eb46beff019d93 /libavformat/ffmdec.c | |
| parent | 096c87f667ab8cdfc4fd290c80421a80c842adca (diff) | |
| download | ffmpeg-d2b34efe225e15bb82793ce166c21af9ab964a5e.tar.gz | |
Update ffserver to include all basic x264 parameters in .ffm files.
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ffmdec.c')
| -rw-r--r-- | libavformat/ffmdec.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index dc4da29f09..d2f16336c2 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -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); |