OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0ce297
)
ffmpeg: Set codec_type in new_output_stream
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 29 Aug 2011 23:20:08 +0000
(
01:20
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 30 Aug 2011 15:57:59 +0000
(17:57 +0200)
Ported from a change from anton khirnov to avconv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
a4bd4bb
..
1fe2c80
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-723,8
+723,10
@@
static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode
ost->index = idx;
ost->st = st;
ost->enc = codec;
- if (codec)
+ if (codec) {
+ st->codec->codec_type = codec->type;
ost->opts = filter_codec_opts(codec_opts, codec->id, oc, st);
+ }
avcodec_get_context_defaults3(st->codec, codec);