generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into oldabi

Browse Source 
* master:
  ffplay: do not init SDL audio if -an is specified.
  Fix zero-length gnu_printf format string warning.
  A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-06-21 21:55:46 +02:00
parent df3850db49 86824c1dcb
commit 1986380df2
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@@ -446,7 +446,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost)
static void term_exit(void) static void term_exit(void)
{ {
av_log(NULL, AV_LOG_QUIET, ""); av_log(NULL, AV_LOG_QUIET, "%s", "");
#if HAVE_TERMIOS_H #if HAVE_TERMIOS_H
if(!run_as_daemon) if(!run_as_daemon)
tcsetattr (0, TCSANOW, &oldtty); tcsetattr (0, TCSANOW, &oldtty);

4
ffplay.c
View File

@@ -904,7 +904,7 @@ static void do_exit(void)
if (show_status) if (show_status)
printf("\n"); printf("\n");
SDL_Quit(); SDL_Quit();
av_log(NULL, AV_LOG_QUIET, ""); av_log(NULL, AV_LOG_QUIET, "%s", "");
exit(0); exit(0);
} }
@@ -3032,6 +3032,8 @@ int main(int argc, char **argv)
video_disable = 1; video_disable = 1;
} }
flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
if (audio_disable)
flags &= ~SDL_INIT_AUDIO;
#if !defined(__MINGW32__) && !defined(__APPLE__) #if !defined(__MINGW32__) && !defined(__APPLE__)
flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */ flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
#endif #endif

8
libavcodec/x86/h264_qpel_mmx.c
View File

@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
"2: \n\t"\ "2: \n\t"\
\ \
: "+a"(src), "+c"(dst)\ : "+a"(src), "+c"(dst)\
: "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: "memory"\ : "memory"\
);\ );\
src += 4-(h+5)*srcStride;\ src += 4-(h+5)*srcStride;\
@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h264_qpel8or16_hv1_lowpass_ ## MMX(int16_
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\ "2: \n\t"\
: "+a"(src)\ : "+a"(src)\
: "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
: "memory"\ : "memory"\
);\ );\
tmp += 4;\ tmp += 4;\
@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
"2: \n\t"\ "2: \n\t"\
\ \
: "+a"(src), "+c"(dst)\ : "+a"(src), "+c"(dst)\
: "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\ "memory"\
@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, u
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t" "2: \n\t"
: "+a"(src) : "+a"(src)
: "c"(tmp), "S"((x86_reg)srcStride), "g"(size) : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",) "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory" "memory"

2
libavutil/log.h
View File

@@ -159,7 +159,7 @@ const char* av_default_item_name(void* ctx);
* "Last message repeated x times" messages below (f)printf messages with some * "Last message repeated x times" messages below (f)printf messages with some
* bad luck. * bad luck.
* Also to receive the last, "last repeated" line if any, the user app must * Also to receive the last, "last repeated" line if any, the user app must
* call av_log(NULL, AV_LOG_QUIET, ""); at the end * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
*/ */
#define AV_LOG_SKIP_REPEATED 1 #define AV_LOG_SKIP_REPEATED 1
void av_log_set_flags(int arg); void av_log_set_flags(int arg);