summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2007-08-23 16:40:23 +0000
committerLuca Barbato <lu_zero@gentoo.org>2007-08-23 16:40:23 +0000
commit2c2b3130c2b236fa854087f30281956e73acdd9d (patch)
tree9c91e930ef246ea62745e46704faebb8cdd8da02 /ffplay.c
parenta677e0cf14198709c890f4e61516b7f13e803dc4 (diff)
downloadffmpeg-2c2b3130c2b236fa854087f30281956e73acdd9d.tar.gz
PowerPC/CELL/Altivec pointers
Originally committed as revision 10197 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/ffplay.c b/ffplay.c
index cbbeb79d24..01c9f0f645 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -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 = &params;
@@ -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) {