Commit ccac2e27 authored by Philip Gladstone's avatar Philip Gladstone

* Add the 'flags' field to the list of codec fields passed from ffserver to

  ffmpeg. This gives the VideoHighQuality patch a fighting chance.

Originally committed as revision 479 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e7f9c674
...@@ -153,6 +153,7 @@ static int ffm_write_header(AVFormatContext *s) ...@@ -153,6 +153,7 @@ static int ffm_write_header(AVFormatContext *s)
put_be32(pb, codec->codec_id); put_be32(pb, codec->codec_id);
put_byte(pb, codec->codec_type); put_byte(pb, codec->codec_type);
put_be32(pb, codec->bit_rate); put_be32(pb, codec->bit_rate);
put_be32(pb, codec->flags);
/* specific info */ /* specific info */
switch(codec->codec_type) { switch(codec->codec_type) {
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
...@@ -376,6 +377,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -376,6 +377,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec.codec_id = get_be32(pb); st->codec.codec_id = get_be32(pb);
st->codec.codec_type = get_byte(pb); /* codec_type */ st->codec.codec_type = get_byte(pb); /* codec_type */
codec->bit_rate = get_be32(pb); codec->bit_rate = get_be32(pb);
codec->flags = get_be32(pb);
/* specific info */ /* specific info */
switch(codec->codec_type) { switch(codec->codec_type) {
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment