[SCM] libav/experimental: properly check for CONFIG_RTSP_DEMUXER

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:59:16 UTC 2013


The following commit has been merged in the experimental branch:
commit 9825d074b44fd873be325440f355eb22f2a70601
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Thu Apr 26 18:11:36 2007 +0000

    properly check for CONFIG_RTSP_DEMUXER
    
    Originally committed as revision 8836 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 51495d2..062c4eb 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2003,6 +2003,8 @@ static int decode_thread(void *arg)
             else
                 av_read_play(ic);
         }
+#endif
+#ifdef CONFIG_RTSP_DEMUXER
         if (is->paused && ic->iformat == &rtsp_demuxer) {
             /* wait 10 ms to avoid trying to get another packet */
             /* XXX: horrible */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list