January 2015 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jan 30 15:43:08 2015 +0100| [d0f315ab6c7d5829f43ebbe18e1e8827dad4c46b] | committer: Michael Niedermayer avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0f315ab6c7d5829f… --- libavcodec/ppc/h264qpel_template.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/ppc/h264qpel_template.c b/libavcodec/ppc/h264qpel_template.c index 9a34548..0e5ecbd 100644 --- a/libavcodec/ppc/h264qpel_template.c +++ b/libavcodec/ppc/h264qpel_template.c @@ -23,15 +23,12 @@ #include <unistd.h> #endif +#include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#ifdef DEBUG -#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F)); -#else -#define ASSERT_ALIGNED(ptr) ; -#endif +#define ASSERT_ALIGNED(ptr) av_assert2(((unsigned long)ptr&0x0000000F)); #if HAVE_BIGENDIAN #define load_alignment(s, ali, pm2, pm1, pp0, pp1, pp2, pp3){\

1 0

ppc/mpegvideo_altivec: Change assert to av_assert2()
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jan 30 15:40:48 2015 +0100| [3531594017bdca10f6e33a2afb65c8416d53d75e] | committer: Michael Niedermayer ppc/mpegvideo_altivec: Change assert to av_assert2() And move it to where the variable is used Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3531594017bdca10f… --- libavcodec/ppc/mpegvideo_altivec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index ce53ae4..1b6bda6 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -42,8 +42,6 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s, int i, level, qmul, qadd; int nCoeffs; - assert(s->block_last_index[n]>=0); - qadd = (qscale - 1) | 1; qmul = qscale << 1; @@ -59,6 +57,7 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s, nCoeffs= 63; //does not always use zigzag table } else { i = 0; + av_assert2(s->block_last_index[n]>=0); nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; }

1 0

avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert*
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 10:58:19 2015 +0000| [be128c1e34263f18b42d1bcb684ba45bad312d75] | committer: Paul B Mahol avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be128c1e34263f18b… --- libavcodec/videodsp_template.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c index f4ff2ba..c569c30 100644 --- a/libavcodec/videodsp_template.c +++ b/libavcodec/videodsp_template.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <assert.h> - #include "bit_depth_template.c" void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, ptrdiff_t buf_linesize,

1 0

avcodec/qdm2: remove unneeded #include, there are no assert()
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 10:42:44 2015 +0000| [3db9960e0aa9874e955add8c13227ce3d1f6aa51] | committer: Paul B Mahol avcodec/qdm2: remove unneeded #include, there are no assert() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3db9960e0aa9874e9… --- libavcodec/qdm2.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 55d9e3f..5e12469 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -46,10 +46,6 @@ #include "qdm2_tablegen.h" -#undef NDEBUG -#include <assert.h> - - #define QDM2_LIST_ADD(list, size, packet) \ do { \ if (size > 0) { \

1 0

ffmpeg: remove unused header
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 14:03:51 2015 +0000| [5274860fe275f43b80386aee42cc617300acc0a2] | committer: Paul B Mahol ffmpeg: remove unused header Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5274860fe275f43b8… --- ffmpeg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 29f61da..9cff557 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -62,8 +62,6 @@ #include "libavutil/threadmessage.h" #include "libavformat/os_support.h" -#include "libavformat/ffm.h" // not public API - # include "libavfilter/avcodec.h" # include "libavfilter/avfilter.h" # include "libavfilter/buffersrc.h"

1 0

avformat/rtpdec_qdm2: change assert to av_assert0()
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 11:44:00 2015 +0000| [80cbf13725592614226aa3533492266f0074d146] | committer: Paul B Mahol avformat/rtpdec_qdm2: change assert to av_assert0() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80cbf137255926142… --- libavformat/rtpdec_qdm2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index e1dd62f..edd9490 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -189,7 +189,7 @@ static int qdm2_restore_block(PayloadContext *qdm, AVStream *st, AVPacket *pkt) uint8_t *p, *csum_pos = NULL; /* create packet to hold subpkts into a superblock */ - assert(qdm->cache > 0); + av_assert0(qdm->cache > 0); for (n = 0; n < 0x80; n++) if (qdm->len[n] > 0) break;

1 0

ffmpeg: free_input_threads requires HAVE_PTHREADS
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Fri Jan 30 13:09:02 2015 +0000| [1fa637d2ef00bf1fddd310221d849cc6ccc139b3] | committer: Michael Niedermayer ffmpeg: free_input_threads requires HAVE_PTHREADS Hide behind that macro to avoid warning on systems with !HAVE_PTHREADS. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fa637d2ef00bf1fd… --- ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index b836448..29f61da 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -155,8 +155,9 @@ static struct termios oldtty; static int restore_tty; #endif +#if HAVE_PTHREADS static void free_input_threads(void); - +#endif /* sub2video hack: Convert subtitles to video with alpha to insert them in filter graphs.

1 0

doc/muxers/segment: document strftime option
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Fri Jan 30 11:48:44 2015 +0100| [40b026b1d0a33684ec28fd7db03e250671babefa] | committer: Stefano Sabatini doc/muxers/segment: document strftime option It was added in commit 202947a0665ea523022afb0a6c50eed96bcd6b69. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40b026b1d0a33684e… --- doc/muxers.texi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index e356235..7ca6409 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -814,8 +814,9 @@ overhead. Basic stream segmenter. This muxer outputs streams to a number of separate files of nearly -fixed duration. Output filename pattern can be set in a fashion similar to -@ref{image2}. +fixed duration. Output filename pattern can be set in a fashion +similar to @ref{image2}, or by using a @code{strftime} template if +the @option{strftime} option is enabled. @code{stream_segment} is a variant of the muxer used to write to streaming output formats, i.e. which do not require global headers, @@ -995,6 +996,12 @@ Wrap around segment index once it reaches @var{limit}. @item segment_start_number @var{number} Set the sequence number of the first segment. Defaults to @code{0}. +@item strftime @var{1|0} +Use the @code{strftime} function to define the name of the new +segments to write. If this is selected, the output segment name must +contain a @code{strftime} function template. Default value is +@code{0}. + @item reset_timestamps @var{1|0} Reset timestamps at the begin of each segment, so that each segment will start with near-zero timestamps. It is meant to ease the playback

1 0

avformat/nut: support WavPack
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 27 18:09:32 2015 +0000| [64815d1f0c782a632447806e40d9c7ee71f31b92] | committer: Paul B Mahol avformat/nut: support WavPack Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64815d1f0c782a632… --- libavformat/nut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/nut.c b/libavformat/nut.c index 04f4bb0..c6fdb0b 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -183,6 +183,7 @@ const AVCodecTag ff_nut_audio_extra_tags[] = { { AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') }, { AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') }, { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, + { AV_CODEC_ID_WAVPACK, MKTAG('w', 'v', 'p', 'k') }, { AV_CODEC_ID_NONE, 0 } };

1 0

avformat/nut: add GIF[0]
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 29 17:09:52 2015 +0000| [b5004f32133fcb98e07ba936b01a576f82f38a7d] | committer: Paul B Mahol avformat/nut: add GIF[0] Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5004f32133fcb98e… --- libavformat/nut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/nut.c b/libavformat/nut.c index 86a0301..04f4bb0 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -40,6 +40,7 @@ const AVCodecTag ff_nut_data_tags[] = { }; const AVCodecTag ff_nut_video_tags[] = { + { AV_CODEC_ID_GIF, MKTAG('G', 'I', 'F', 0 ) }, { AV_CODEC_ID_XFACE, MKTAG('X', 'F', 'A', 'C') }, { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },

1 0