Revision 8d931070 ffserver.c

View differences:

ffserver.c
2000 2000
            AVStream *st;
2001 2001
	    AVStream *src;
2002 2002
            st = av_mallocz(sizeof(AVStream));
2003
            st->codec= avcodec_alloc_context();
2003 2004
            c->fmt_ctx.streams[i] = st;
2004 2005
            /* if file or feed, then just take streams from FFStream struct */
2005 2006
            if (!c->stream->feed || 
......
3138 3139
    st = av_mallocz(sizeof(AVStream));
3139 3140
    if (!st)
3140 3141
        goto fail;
3142
    st->codec= avcodec_alloc_context();
3141 3143
    ctx->nb_streams = 1;
3142 3144
    ctx->streams[0] = st;
3143 3145

  
......
3221 3223
    fst = av_mallocz(sizeof(AVStream));
3222 3224
    if (!fst)
3223 3225
        return NULL;
3226
    fst->codec= avcodec_alloc_context();
3224 3227
    fst->priv_data = av_mallocz(sizeof(FeedData));
3225 3228
    memcpy(fst->codec, codec, sizeof(AVCodecContext));
3226 3229
    fst->codec->coded_frame = &dummy_frame;
......
3664 3667
    st = av_mallocz(sizeof(AVStream));
3665 3668
    if (!st)
3666 3669
        return;
3670
    st->codec = avcodec_alloc_context();
3667 3671
    stream->streams[stream->nb_streams++] = st;
3668 3672
    memcpy(st->codec, av, sizeof(AVCodecContext));
3669 3673
}
......
3971 3975
                stream->stream_type = STREAM_TYPE_LIVE;
3972 3976
                /* jpeg cannot be used here, so use single frame jpeg */
3973 3977
                if (!strcmp(arg, "jpeg"))
3974
                    strcpy(arg, "singlejpeg");
3978
                    strcpy(arg, "mjpeg");
3975 3979
                stream->fmt = guess_stream_format(arg, NULL, NULL);
3976 3980
                if (!stream->fmt) {
3977 3981
                    fprintf(stderr, "%s:%d: Unknown Format: %s\n", 

Also available in: Unified diff