summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2011-12-12 17:30:55 +0100
committerMichael Niedermayer <[email protected]>2011-12-12 18:08:37 +0100
commite6a5de4421a8b46abf362247bb9ff015c7550144 (patch)
tree84130ac29d8ce68e4417bf9ce072a2d98818537f
parentb8c41e5c08a80e8f4772572a5b61ad414e7fcbc0 (diff)
ffmpeg: fix codecids with ffserver + ffmpeg + ffm
Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ee731c1ab071ee51839fd6c2db15dc719349ebb2) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index ee79e32039..12089413f0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3962,6 +3962,7 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch
ost = new_output_stream(o, s, codec->type);
st = ost->st;
avctx = st->codec;
+ ost->enc = codec;
// FIXME: a more elegant solution is needed
memcpy(st, ic->streams[i], sizeof(AVStream));