Browse Source

Remove RTSP special casing in ffplay startup

Originally committed as revision 10202 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Luca Abeni 18 years ago
parent
commit
b2e6799bbb
1 changed files with 1 additions and 22 deletions
  1. +1
    -22
      ffplay.c

+ 1
- 22
ffplay.c View File

@@ -1871,7 +1871,7 @@ static int decode_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFormatContext *ic; AVFormatContext *ic;
int err, i, ret, video_index, audio_index, use_play;
int err, i, ret, video_index, audio_index;
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = &params; AVFormatParameters params, *ap = &params;


@@ -1885,8 +1885,6 @@ static int decode_thread(void *arg)
url_set_interrupt_cb(decode_interrupt_cb); url_set_interrupt_cb(decode_interrupt_cb);


memset(ap, 0, sizeof(*ap)); memset(ap, 0, sizeof(*ap));
ap->initial_pause = 1; /* we force a pause when starting an RTSP
stream */


ap->width = frame_width; ap->width = frame_width;
ap->height= frame_height; ap->height= frame_height;
@@ -1900,16 +1898,10 @@ static int decode_thread(void *arg)
goto fail; goto fail;
} }
is->ic = ic; is->ic = ic;
#ifdef CONFIG_RTSP_DEMUXER
use_play = (ic->iformat == &rtsp_demuxer);
#else
use_play = 0;
#endif


if(genpts) if(genpts)
ic->flags |= AVFMT_FLAG_GENPTS; ic->flags |= AVFMT_FLAG_GENPTS;


if (!use_play) {
err = av_find_stream_info(ic); err = av_find_stream_info(ic);
if (err < 0) { if (err < 0) {
fprintf(stderr, "%s: could not find codec parameters\n", is->filename); fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
@@ -1917,7 +1909,6 @@ static int decode_thread(void *arg)
goto fail; goto fail;
} }
ic->pb.eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end ic->pb.eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end
}


/* if seeking requested, we execute it */ /* if seeking requested, we execute it */
if (start_time != AV_NOPTS_VALUE) { if (start_time != AV_NOPTS_VALUE) {
@@ -1934,18 +1925,6 @@ static int decode_thread(void *arg)
} }
} }


/* now we can begin to play (RTSP stream only) */
av_read_play(ic);

if (use_play) {
err = av_find_stream_info(ic);
if (err < 0) {
fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
ret = -1;
goto fail;
}
}

for(i = 0; i < ic->nb_streams; i++) { for(i = 0; i < ic->nb_streams; i++) {
AVCodecContext *enc = ic->streams[i]->codec; AVCodecContext *enc = ic->streams[i]->codec;
switch(enc->codec_type) { switch(enc->codec_type) {


Loading…
Cancel
Save