diff options
| author | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-11-16 21:51:42 +0100 |
|---|---|---|
| committer | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-11-26 23:32:33 +0100 |
| commit | ec6e035b8b1fcd7a1838ac12c887389a44af4d98 (patch) | |
| tree | 321971b7d55c56b8606bd5f0f478728623f57050 /ffserver.c | |
| parent | aaf6cc925f7f07a20956dbd0c8dc9927e84ac626 (diff) | |
| download | ffmpeg-ec6e035b8b1fcd7a1838ac12c887389a44af4d98.tar.gz | |
ffserver: export recommented encoder configuration
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index e24243d9ca..3702fd638a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3326,8 +3326,7 @@ static int add_av_stream(FFServerStream *feed, AVStream *st) av = st->codec; for(i=0;i<feed->nb_streams;i++) { - st = feed->streams[i]; - av1 = st->codec; + av1 = feed->streams[i]->codec; if (av1->codec_id == av->codec_id && av1->codec_type == av->codec_type && av1->bit_rate == av->bit_rate) { @@ -3355,6 +3354,9 @@ static int add_av_stream(FFServerStream *feed, AVStream *st) fst = add_av_stream1(feed, av, 0); if (!fst) return -1; + if (av_stream_get_recommended_encoder_configuration(st)) + av_stream_set_recommended_encoder_configuration(fst, + av_strdup(av_stream_get_recommended_encoder_configuration(st))); return feed->nb_streams - 1; } |