aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-12 01:43:52 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-12 01:43:52 +0000
commit837d248df67340defb8a8cf8fd09bba8ed89763c (patch)
tree7d69a214b8f0205c891413efbfe43876bd701179 /ffmpeg.c
parentce072b2d30627413dc0c58dd8d1fc898a7abcadd (diff)
downloadffmpeg-837d248df67340defb8a8cf8fd09bba8ed89763c.tar.gz
enable stream copy with ffserver, to be able to chain
Originally committed as revision 13753 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 0ce61a39bd..08338120cc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -443,6 +443,12 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
st->codec = avcodec_alloc_context();
memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext));
s->streams[i] = st;
+
+ if (st->codec->codec_type == CODEC_TYPE_AUDIO && audio_stream_copy)
+ st->stream_copy = 1;
+ else if (st->codec->codec_type == CODEC_TYPE_VIDEO && video_stream_copy)
+ st->stream_copy = 1;
+
if(st->codec->flags & CODEC_FLAG_BITEXACT)
nopts = 1;
}