virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

remove dummy coded frame, no muxer should use it anyway

Browse Source 
Originally committed as revision 13497 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-28 17:04:45 +00:00
parent a28d9122d2
commit 3fb53d55db
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffserver.c
View File

@ -171,8 +171,6 @@ typedef struct HTTPContext {
uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end; uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end;
} HTTPContext; } HTTPContext;
static AVFrame dummy_frame;
/* each generated stream is described here */ /* each generated stream is described here */
enum StreamType { enum StreamType {
STREAM_TYPE_LIVE, STREAM_TYPE_LIVE,
@ -2024,10 +2022,6 @@ static int http_prepare_data(HTTPContext *c)
st->priv_data = 0; st->priv_data = 0;
st->codec->frame_number = 0; /* XXX: should be done in st->codec->frame_number = 0; /* XXX: should be done in
AVStream, not in codec */ AVStream, not in codec */
/* I'm pretty sure that this is not correct...
* However, without it, we crash
*/
st->codec->coded_frame = &dummy_frame;
} }
c->got_key_frame = 0; c->got_key_frame = 0;
@ -2160,7 +2154,6 @@ static int http_prepare_data(HTTPContext *c)
codec = ctx->streams[pkt.stream_index]->codec; codec = ctx->streams[pkt.stream_index]->codec;
} }
codec->coded_frame->key_frame = ((pkt.flags & PKT_FLAG_KEY) != 0);
if (c->is_packetized) { if (c->is_packetized) {
int max_packet_size; int max_packet_size;
if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP)
@ -3186,7 +3179,6 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec)
fst->codec= avcodec_alloc_context(); fst->codec= avcodec_alloc_context();
fst->priv_data = av_mallocz(sizeof(FeedData)); fst->priv_data = av_mallocz(sizeof(FeedData));
memcpy(fst->codec, codec, sizeof(AVCodecContext)); memcpy(fst->codec, codec, sizeof(AVCodecContext));
fst->codec->coded_frame = &dummy_frame;
fst->index = stream->nb_streams; fst->index = stream->nb_streams;
av_set_pts_info(fst, 33, 1, 90000); av_set_pts_info(fst, 33, 1, 90000);
stream->streams[stream->nb_streams++] = fst; stream->streams[stream->nb_streams++] = fst;