[FFmpeg-cvslog] ffmpeg: fix codecids with ffserver + ffmpeg + ffm
Michael Niedermayer
git at videolan.org
Tue Dec 13 22:09:38 CET 2011
ffmpeg | branch: release/0.9 | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 12 17:30:55 2011 +0100| [e6a5de4421a8b46abf362247bb9ff015c7550144] | committer: Michael Niedermayer
ffmpeg: fix codecids with ffserver + ffmpeg + ffm
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ee731c1ab071ee51839fd6c2db15dc719349ebb2)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6a5de4421a8b46abf362247bb9ff015c7550144
---
ffmpeg.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index ee79e32..1208941 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));
More information about the ffmpeg-cvslog
mailing list