diff options
author | Luca Abeni <lucabe72@email.it> | 2007-08-24 07:17:56 +0000 |
---|---|---|
committer | Luca Abeni <lucabe72@email.it> | 2007-08-24 07:17:56 +0000 |
commit | b2e6799bbbf6c4fbc2dc9ab2dc9aed8bbc7cabac (patch) | |
tree | 5b43ef9badc0f1acdccae9c6cc27b286c9d30c42 | |
parent | 98561024ac791d9aa5caee0700f9cb55188fa266 (diff) | |
download | ffmpeg-b2e6799bbbf6c4fbc2dc9ab2dc9aed8bbc7cabac.tar.gz |
Remove RTSP special casing in ffplay startup
Originally committed as revision 10202 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | ffplay.c | 23 |
1 files changed, 1 insertions, 22 deletions
@@ -1871,7 +1871,7 @@ static int decode_thread(void *arg) { VideoState *is = arg; AVFormatContext *ic; - int err, i, ret, video_index, audio_index, use_play; + int err, i, ret, video_index, audio_index; AVPacket pkt1, *pkt = &pkt1; AVFormatParameters params, *ap = ¶ms; @@ -1885,8 +1885,6 @@ static int decode_thread(void *arg) url_set_interrupt_cb(decode_interrupt_cb); memset(ap, 0, sizeof(*ap)); - ap->initial_pause = 1; /* we force a pause when starting an RTSP - stream */ ap->width = frame_width; ap->height= frame_height; @@ -1900,16 +1898,10 @@ static int decode_thread(void *arg) goto fail; } is->ic = ic; -#ifdef CONFIG_RTSP_DEMUXER - use_play = (ic->iformat == &rtsp_demuxer); -#else - use_play = 0; -#endif if(genpts) ic->flags |= AVFMT_FLAG_GENPTS; - if (!use_play) { err = av_find_stream_info(ic); if (err < 0) { fprintf(stderr, "%s: could not find codec parameters\n", is->filename); @@ -1917,7 +1909,6 @@ static int decode_thread(void *arg) goto fail; } 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 (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++) { AVCodecContext *enc = ic->streams[i]->codec; switch(enc->codec_type) { |