summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/optimization.txt11
-rw-r--r--ffplay.c23
2 files changed, 12 insertions, 22 deletions
diff --git a/doc/optimization.txt b/doc/optimization.txt
index 89b87b5719..fdcaa6ea5c 100644
--- a/doc/optimization.txt
+++ b/doc/optimization.txt
@@ -158,6 +158,17 @@ http://www.arm.com/community/academy/resources.html
Instructions timings and optimization guide for ARM9E:
http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
+PowerPC-specific:
+
+PowerPC32/Altivec PIM:
+www.freescale.com/files/32bit/doc/ref_manual/ALTIVECPEM.pdf
+
+PowerPC32/Altivec PEM:
+www.freescale.com/files/32bit/doc/ref_manual/ALTIVECPIM.pdf
+
+CELL/SPU:
+http://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/30B3520C93F437AB87257060006FFE5E/$file/Language_Extensions_for_CBEA_2.4.pdf
+http://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/9F820A5FFA3ECE8C8725716A0062585F/$file/CBE_Handbook_v1.1_24APR2007_pub.pdf
SPARC-specific:
SPARC Joint Programming Specification (JPS1): Commonality
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) {