June 2012 - ffmpeg-cvslog - lists.ffmpeg.org

swr: fix make checkheaders.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sat Jun 30 11:21:53 2012 +0200| [ca612a27ae11c653367ee2438fcb7d99d3efafb3] | committer: Clément Bœsch swr: fix make checkheaders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca612a27ae11c6533… --- libswresample/x86/resample_mmx.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libswresample/x86/resample_mmx.h b/libswresample/x86/resample_mmx.h index 6772655..a48d6ea 100644 --- a/libswresample/x86/resample_mmx.h +++ b/libswresample/x86/resample_mmx.h @@ -20,6 +20,7 @@ #include "libavutil/x86_cpu.h" #include "libavutil/cpu.h" +#include "libswresample/swresample_internal.h" int swri_resample_int16_mmx2 (struct ResampleContext *c, int16_t *dst, const int16_t *src, int *consumed, int src_size, int dst_size, int update_ctx); int swri_resample_int16_ssse3(struct ResampleContext *c, int16_t *dst, const int16_t *src, int *consumed, int src_size, int dst_size, int update_ctx);

1 0

swr: small align cosmetic.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sat Jun 30 11:18:45 2012 +0200| [022cbb6791c26940a8c89c4a32193c104b57d610] | committer: Clément Bœsch swr: small align cosmetic. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=022cbb6791c26940a… --- libswresample/x86/resample_mmx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/x86/resample_mmx.h b/libswresample/x86/resample_mmx.h index 678fc03..6772655 100644 --- a/libswresample/x86/resample_mmx.h +++ b/libswresample/x86/resample_mmx.h @@ -37,7 +37,7 @@ __asm__ volatile(\ "add $8, %0 \n\t"\ " js 1b \n\t"\ "pshufw $0x0E, %%mm0, %%mm1 \n\t"\ - "paddd %%mm1, %%mm0 \n\t"\ + "paddd %%mm1, %%mm0 \n\t"\ "psrad $15, %%mm0 \n\t"\ "packssdw %%mm0, %%mm0 \n\t"\ "movd %%mm0, (%3) \n\t"\

1 0

swr: use __asm__ instead of __asm.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sat Jun 30 11:18:05 2012 +0200| [3491c2a909bd07696fab7eae957cb8da5841bb4c] | committer: Clément Bœsch swr: use __asm__ instead of __asm. For consistency only. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3491c2a909bd07696… --- libswresample/x86/resample_mmx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/x86/resample_mmx.h b/libswresample/x86/resample_mmx.h index bbf23ad..678fc03 100644 --- a/libswresample/x86/resample_mmx.h +++ b/libswresample/x86/resample_mmx.h @@ -28,7 +28,7 @@ DECLARE_ALIGNED(16, const uint64_t, ff_resample_int16_rounder)[2] = { 0x00000 #define COMMON_CORE_INT16_MMX2 \ x86_reg len= -2*c->filter_length;\ -__asm volatile(\ +__asm__ volatile(\ "movq "MANGLE(ff_resample_int16_rounder)", %%mm0 \n\t"\ "1: \n\t"\ "movq (%1, %0), %%mm1 \n\t"\ @@ -49,7 +49,7 @@ __asm volatile(\ #define COMMON_CORE_INT16_SSSE3 \ x86_reg len= -2*c->filter_length;\ -__asm volatile(\ +__asm__ volatile(\ "movdqa "MANGLE(ff_resample_int16_rounder)", %%xmm0 \n\t"\ "1: \n\t"\ "movdqu (%1, %0), %%xmm1 \n\t"\

1 0

file: Only include unistd.h if it exists
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Mon Jun 25 00:42:27 2012 +0300| [3b1ab197be185b61247ef2472f15eeac3e765252] | committer: Martin Storsjö file: Only include unistd.h if it exists It is included for the open/read/write/close functions. On MSVC, where this header does not exist, the same functions are provided by io.h, which is already included. On windows, these functions are provided by io.h. Make sure io.h is included if it exists, regardless of the setmode function. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b1ab197be185b612… --- configure | 2 ++ libavformat/file.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3619eff..1290369 100755 --- a/configure +++ b/configure @@ -1093,6 +1093,7 @@ HAVE_LIST=" ibm_asm inet_aton inline_asm + io_h isatty isinf isnan @@ -2879,6 +2880,7 @@ check_func_headers windows.h VirtualAlloc check_header dlfcn.h check_header dxva.h check_header dxva2api.h +check_header io.h check_header malloc.h check_header poll.h check_header sys/mman.h diff --git a/libavformat/file.c b/libavformat/file.c index cca9ec1..0e3577d 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -22,10 +22,12 @@ #include "libavutil/avstring.h" #include "avformat.h" #include <fcntl.h> -#if HAVE_SETMODE +#if HAVE_IO_H #include <io.h> #endif +#if HAVE_UNISTD_H #include <unistd.h> +#endif #include <sys/stat.h> #include <stdlib.h> #include "os_support.h"

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jun 29 23:24:58 2012 +0200| [8a85660d3b9b610549b65cba09b4b7a1acb880bd] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: file: Only include unistd.h if it exists random_seed: Only read /dev/*random if we have unistd.h doc: Indicate that RTMPT is natively implemented in libavformat rtpdec: Don't explicitly include unistd.h any longer Conflicts: configure Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a85660d3b9b61054… ---

1 0

random_seed: Only read /dev/*random if we have unistd.h
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Jun 24 21:26:31 2012 +0300| [f985113075b0c571b1b1b166fe28f87f0f291be5] | committer: Martin Storsjö random_seed: Only read /dev/*random if we have unistd.h unistd.h is used for open/read/close, but if this header does not exist, there's probably no use in trying to open /dev/*random at all. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f985113075b0c571b… --- libavutil/random_seed.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 51ca99b..8ee4cb7 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + +#if HAVE_UNISTD_H #include <unistd.h> +#endif #include <fcntl.h> #include <math.h> #include <time.h> @@ -27,6 +31,7 @@ static int read_random(uint32_t *dst, const char *file) { +#if HAVE_UNISTD_H int fd = open(file, O_RDONLY); int err = -1; @@ -36,6 +41,9 @@ static int read_random(uint32_t *dst, const char *file) close(fd); return err; +#else + return -1; +#endif } static uint32_t get_generic_seed(void)

1 0

doc: Indicate that RTMPT is natively implemented in libavformat
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Samuel Pitoiset <samuel.pitoiset(a)gmail.com> | Fri Jun 29 14:18:41 2012 +0200| [e312fcde6a46d7fdfc5f3f880dd97987402d7138] | committer: Martin Storsjö doc: Indicate that RTMPT is natively implemented in libavformat Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e312fcde6a46d7fdf… --- doc/general.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/general.texi b/doc/general.texi index 28e89f0..1d00ef5 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -831,7 +831,7 @@ performance on systems without hardware floating point support). @item RTMP @tab X @item RTMPE @tab E @item RTMPS @tab E -@item RTMPT @tab E +@item RTMPT @tab X @item RTMPTE @tab E @item RTP @tab X @item SCTP @tab X

1 0

rtpdec: Don't explicitly include unistd.h any longer
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Jun 24 21:05:21 2012 +0300| [dfb57fc5962006cdc61a1eb13b5ef078572eecca] | committer: Martin Storsjö rtpdec: Don't explicitly include unistd.h any longer unistd.h used to be required for gethostname. On windows, gethostname is provided by winsock2.h. Now network.h includes both unistd.h and winsock2.h if they exist. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfb57fc5962006cdc… --- libavformat/rtpdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index b3bce24..87d9255 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -26,7 +26,6 @@ #include "mpegts.h" #include "url.h" -#include <unistd.h> #include "network.h" #include "rtpdec.h"

1 0

ffplay: vertially align complex if condition in audio_decode_frame()
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Thu Jun 28 23:50:35 2012 +0200| [8179660222ec27b61d072ede8e515999c44b81da] | committer: Stefano Sabatini ffplay: vertially align complex if condition in audio_decode_frame() Possibly improve readability. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8179660222ec27b61… --- ffplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffplay.c b/ffplay.c index f8a18d4..de78db9 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1961,9 +1961,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) dec->channel_layout : av_get_default_channel_layout(dec->channels); wanted_nb_samples = synchronize_audio(is, is->frame->nb_samples); - if (dec->sample_fmt != is->audio_src.fmt || + if (dec->sample_fmt != is->audio_src.fmt || dec_channel_layout != is->audio_src.channel_layout || - dec->sample_rate != is->audio_src.freq || + dec->sample_rate != is->audio_src.freq || (wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) { swr_free(&is->swr_ctx); is->swr_ctx = swr_alloc_set_opts(NULL,

1 0

ffplay: group together and vertically align correlated parameters in log function
by git＠videolan.org 29 Jun '12

29 Jun '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Thu Jun 28 23:51:19 2012 +0200| [94a00ec8af342e037c50c64214546c7673745040] | committer: Stefano Sabatini ffplay: group together and vertically align correlated parameters in log function Possibly improve readability. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94a00ec8af342e037… --- ffplay.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ffplay.c b/ffplay.c index de78db9..df66a2e 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1972,12 +1972,8 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) 0, NULL); if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) { fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n", - dec->sample_rate, - av_get_sample_fmt_name(dec->sample_fmt), - dec->channels, - is->audio_tgt.freq, - av_get_sample_fmt_name(is->audio_tgt.fmt), - is->audio_tgt.channels); + dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels, + is->audio_tgt.freq, av_get_sample_fmt_name(is->audio_tgt.fmt), is->audio_tgt.channels); break; } is->audio_src.channel_layout = dec_channel_layout;

1 0