aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-12 17:30:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-12 17:30:55 +0100
commitee731c1ab071ee51839fd6c2db15dc719349ebb2 (patch)
tree79610ceccb4f5344e9a624a0cdd05134a63dd64e /ffmpeg.c
parent8349dbfe46140373082f43ca090dac22696afbb4 (diff)
downloadffmpeg-ee731c1ab071ee51839fd6c2db15dc719349ebb2.tar.gz
ffmpeg: fix codecids with ffserver + ffmpeg + ffm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index daa014b0e6..9154f3cb4a 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));