[FFmpeg-cvslog] avfilter: update some comments

2016-01-24 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Jan 24 13:14:26 
2016 +0100| [547d41207804b5651ecb15fec7c2cfa5e42d7f2f] | committer: Paul B Mahol

avfilter: update some comments

start_frame is no more, samplesref argument is now frame argument.

Signed-off-by: Paul B Mahol 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=547d41207804b5651ecb15fec7c2cfa5e42d7f2f
---

 libavfilter/avfilter.h |2 +-
 libavfilter/internal.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 599369d..04bf585 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -491,7 +491,7 @@ struct AVFilterLink {
 
 /**
  * Link status.
- * If not zero, all attempts of start_frame, filter_frame or request_frame
+ * If not zero, all attempts of filter_frame or request_frame
  * will fail with the corresponding code, and if necessary the reference
  * will be destroyed.
  * If request_frame returns an error, the status is set on the
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 766debe..769e65b 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -86,7 +86,7 @@ struct AVFilterPad {
  * Input pads only.
  *
  * @return >= 0 on success, a negative AVERROR on error. This function
- * must ensure that samplesref is properly unreferenced on error if it
+ * must ensure that frame is properly unreferenced on error if it
  * hasn't been passed on to another filter.
  */
 int (*filter_frame)(AVFilterLink *link, AVFrame *frame);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi/pthread: fix perameters/parameters typo

2016-01-24 Thread Clément Bœsch 
ffmpeg | branch: master | Clément Bœsch  | Sun Jan 24 14:41:00 
2016 +0100| [17d41220d81d605a242eaf3a5063d240f5e3e40e] | committer: Clément 
Bœsch

lavfi/pthread: fix perameters/parameters typo

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17d41220d81d605a242eaf3a5063d240f5e3e40e
---

 libavfilter/pthread.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index 1c54193..37ca73f 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -40,7 +40,7 @@ typedef struct ThreadContext {
 pthread_t *workers;
 avfilter_action_func *func;
 
-/* per-execute perameters */
+/* per-execute parameters */
 AVFilterContext *ctx;
 void *arg;
 int   *rets;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avdevice: Mark decklink_common.h as unconditional SKIPHEADER

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Tue Dec  1 
21:44:50 2015 -0800| [af54a36fc42d2d2824b5820b59af9f421b849371] | committer: 
Timothy Gu

avdevice: Mark decklink_common.h as unconditional SKIPHEADER

It is a C++ file, incompatible with the checkheaders infrastructure.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af54a36fc42d2d2824b5820b59af9f421b849371
---

 libavdevice/Makefile |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index f57ec0b..8394e87 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -58,8 +58,9 @@ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
 # Windows resource file
 SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
 
+SKIPHEADERS  += decklink_common.h
 SKIPHEADERS-$(CONFIG_DECKLINK)   += decklink_enc.h decklink_dec.h \
-decklink_common.h 
decklink_common_c.h
+decklink_common_c.h
 SKIPHEADERS-$(CONFIG_DSHOW_INDEV)+= dshow_capture.h
 SKIPHEADERS-$(CONFIG_FBDEV_INDEV)+= fbdev_common.h
 SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)   += fbdev_common.h

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] common.mak: Use CCFLAGS for assembly generation as well

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Tue Dec  1 
20:55:37 2015 -0800| [bd4d192081230b217ecab14d39daf06f40067191] | committer: 
Timothy Gu

common.mak: Use CCFLAGS for assembly generation as well

CCFLAGS is equivalent to CPPFLAGS + CFLAGS, and it is already being used
by other make rules like %.i and %.o. Simplifies common.mak.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd4d192081230b217ecab14d39daf06f40067191
---

 common.mak |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index 5645e2d..3812149 100644
--- a/common.mak
+++ b/common.mak
@@ -67,7 +67,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_M)
 
 %.s: %.c
-   $(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $<
+   $(CC) $(CCFLAGS) -S -o $@ $<
 
 %.o: %.S
$(COMPILE_S)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] decklink: Header cleanup

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Tue Dec  1 
20:58:51 2015 -0800| [61fb70c3866b19dccf473ad4e5ede79d117e8e1c] | committer: 
Timothy Gu

decklink: Header cleanup

This commit cleans up the decklink files' header usage so that they pass
checkheaders.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61fb70c3866b19dccf473ad4e5ede79d117e8e1c
---

 libavdevice/decklink_common.cpp |4 
 libavdevice/decklink_common.h   |8 +++-
 libavdevice/decklink_common_c.h |2 ++
 libavdevice/decklink_dec.cpp|4 
 libavdevice/decklink_dec.h  |2 ++
 libavdevice/decklink_enc.cpp|4 
 libavdevice/decklink_enc.h  |2 ++
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index ac7964c..58502ee 100644
--- a/libavdevice/decklink_common.cpp
+++ b/libavdevice/decklink_common.cpp
@@ -26,11 +26,7 @@
 #include 
 #endif
 
-#include 
-#include 
-
 extern "C" {
-#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index 3bc30f0..c7e3ef2 100644
--- a/libavdevice/decklink_common.h
+++ b/libavdevice/decklink_common.h
@@ -19,9 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include 
+#include 
+#include 
+#include 
+
+extern "C" {
+#include "libavformat/avformat.h"
 
 #include "decklink_common_c.h"
+}
 
 class decklink_output_callback;
 class decklink_input_callback;
diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h
index fb2b788..3644fb4 100644
--- a/libavdevice/decklink_common_c.h
+++ b/libavdevice/decklink_common_c.h
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/log.h"
+
 struct decklink_cctx {
 const AVClass *cclass;
 
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 6c5bc5d..4bbc92e 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -21,11 +21,7 @@
 
 #include 
 
-#include 
-#include 
-
 extern "C" {
-#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h
index 6bd9226..c499bc9 100644
--- a/libavdevice/decklink_dec.h
+++ b/libavdevice/decklink_dec.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif
 
+#include "libavformat/avformat.h"
+
 int ff_decklink_read_header(AVFormatContext *avctx);
 int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_read_close(AVFormatContext *avctx);
diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 6c5450f..334c3dc 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -21,11 +21,7 @@
 
 #include 
 
-#include 
-#include 
-
 extern "C" {
-#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h
index 6086947..23c59a2 100644
--- a/libavdevice/decklink_enc.h
+++ b/libavdevice/decklink_enc.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif
 
+#include "libavformat/avformat.h"
+
 int ff_decklink_write_header(AVFormatContext *avctx);
 int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_write_trailer(AVFormatContext *avctx);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Print the whitelists if entities are not found on them

2016-01-24 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jan 24 16:15:24 2016 +0100| [a7305c780b54b587adb73baa7b387bbcd784a1d1] | 
committer: Michael Niedermayer

Print the whitelists if entities are not found on them

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7305c780b54b587adb73baa7b387bbcd784a1d1
---

 libavcodec/utils.c  |2 +-
 libavformat/utils.c |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 63439bb..fb6c5f4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1234,7 +1234,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext 
*avctx, const AVCodec *code
 goto free_and_end;
 
 if (avctx->codec_whitelist && av_match_list(codec->name, 
avctx->codec_whitelist, ',') <= 0) {
-av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist\n", 
codec->name);
+av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist \'%s\'\n", 
codec->name, avctx->codec_whitelist);
 ret = AVERROR(EINVAL);
 goto free_and_end;
 }
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b6457b0..6bf2fd1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -313,7 +313,7 @@ int av_demuxer_open(AVFormatContext *ic) {
 int err;
 
 if (ic->format_whitelist && av_match_list(ic->iformat->name, 
ic->format_whitelist, ',') <= 0) {
-av_log(ic, AV_LOG_ERROR, "Format not on whitelist\n");
+av_log(ic, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", 
ic->format_whitelist);
 return AVERROR(EINVAL);
 }
 
@@ -442,7 +442,7 @@ int avformat_open_input(AVFormatContext **ps, const char 
*filename,
 s->probe_score = ret;
 
 if (s->format_whitelist && av_match_list(s->iformat->name, 
s->format_whitelist, ',') <= 0) {
-av_log(s, AV_LOG_ERROR, "Format not on whitelist\n");
+av_log(s, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", 
s->format_whitelist);
 ret = AVERROR(EINVAL);
 goto fail;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat: Document urls a bit

2016-01-24 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Jan 23 00:35:46 2016 +0100| [3130556c0eb09f3da3c9de6473a97937a4648d62] | 
committer: Michael Niedermayer

avformat: Document urls a bit

Spell-checked-by: Moritz Barsnick 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3130556c0eb09f3da3c9de6473a97937a4648d62
---

 libavformat/avformat.h |   12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4964263..285bb16 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -78,6 +78,18 @@
  * if its AVClass is non-NULL, and the protocols layer. See the discussion on
  * nesting in @ref avoptions documentation to learn how to access those.
  *
+ * @section urls
+ * URL strings in libavformat are made of a scheme/protocol, a ':', and a
+ * scheme specific string. URLs without a scheme and ':' used for local files
+ * are supported but deprecated. "file:" should be used for local files.
+ *
+ * It is important that the scheme string is not taken from untrusted
+ * sources without checks.
+ *
+ * Note that some schemes/protocols are quite powerful, allowing access to
+ * both local and remote files, parts of them, concatenations of them, local
+ * audio and video devices and so on.
+ *
  * @defgroup lavf_decoding Demuxing
  * @{
  * Demuxers read a media file and split it into chunks of data (@em packets). A

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat: Remove support for libquvi

2016-01-24 Thread Kieran Kunhya 
ffmpeg | branch: master | Kieran Kunhya  | Sun Jan 24 
15:54:00 2016 +| [2d40a09b6e73230b160a505f01ed1acf169e1d9f] | committer: 
Kieran Kunhya

avformat: Remove support for libquvi

libquvi has not been updated since 2013.
It also has a number of security issues.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d40a09b6e73230b160a505f01ed1acf169e1d9f
---

 configure|4 --
 doc/demuxers.texi|   12 
 libavformat/Makefile |1 -
 libavformat/allformats.c |1 -
 libavformat/libquvi.c|  179 --
 libavformat/version.h|2 +-
 6 files changed, 1 insertion(+), 198 deletions(-)

diff --git a/configure b/configure
index f7d1000..35e3513 100755
--- a/configure
+++ b/configure
@@ -241,7 +241,6 @@ External library support:
   --enable-libopus enable Opus de/encoding via libopus [no]
   --enable-libpulseenable Pulseaudio input via libpulse [no]
   --enable-librubberband   enable rubberband needed for rubberband filter [no]
-  --enable-libquvi enable quvi input via libquvi [no]
   --enable-librtmp enable RTMP[E] support via librtmp [no]
   --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
   --enable-libshineenable fixed-point MP3 encoding via libshine [no]
@@ -1467,7 +1466,6 @@ EXTERNAL_LIBRARY_LIST="
 libopenjpeg
 libopus
 libpulse
-libquvi
 librtmp
 librubberband
 libschroedinger
@@ -2632,7 +2630,6 @@ libopenjpeg_encoder_deps="libopenjpeg"
 libopus_decoder_deps="libopus"
 libopus_encoder_deps="libopus"
 libopus_encoder_select="audio_frame_queue"
-libquvi_demuxer_deps="libquvi"
 libschroedinger_decoder_deps="libschroedinger"
 libschroedinger_encoder_deps="libschroedinger"
 libshine_encoder_deps="libshine"
@@ -5473,7 +5470,6 @@ enabled libopenjpeg   && { check_lib 
openjpeg-2.1/openjpeg.h opj_version -lo
die "ERROR: libopenjpeg not found"; }
 enabled libopus   && require_pkg_config opus opus_multistream.h 
opus_multistream_decoder_create
 enabled libpulse  && require_pkg_config libpulse pulse/pulseaudio.h 
pa_context_new
-enabled libquvi   && require_pkg_config libquvi quvi/quvi.h quvi_init
 enabled librtmp   && require_pkg_config librtmp librtmp/rtmp.h 
RTMP_Socket
 enabled librubberband && require_pkg_config "rubberband >= 1.8.1" 
rubberband/rubberband-c.h rubberband_new
 enabled libschroedinger   && require_pkg_config schroedinger-1.0 
schroedinger/schro.h schro_init
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 094edc2..188808b 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -238,18 +238,6 @@ track. Track indexes start at 0. The demuxer exports the 
number of tracks as
 
 For very large files, the @option{max_size} option may have to be adjusted.
 
-@section libquvi
-
-Play media from Internet services using the quvi project.
-
-The demuxer accepts a @option{format} option to request a specific quality. It
-is by default set to @var{best}.
-
-See @url{http://quvi.sourceforge.net/} for more information.
-
-FFmpeg needs to be built with @code{--enable-libquvi} for this demuxer to be
-enabled.
-
 @section gif
 
 Animated GIF demuxer.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e03c73e..35a383d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -508,7 +508,6 @@ OBJS-$(CONFIG_LIBGME_DEMUXER)+= libgme.o
 OBJS-$(CONFIG_LIBMODPLUG_DEMUXER)+= libmodplug.o
 OBJS-$(CONFIG_LIBNUT_DEMUXER)+= libnut.o
 OBJS-$(CONFIG_LIBNUT_MUXER)  += libnut.o
-OBJS-$(CONFIG_LIBQUVI_DEMUXER)   += libquvi.o
 OBJS-$(CONFIG_LIBRTMP)   += librtmp.o
 OBJS-$(CONFIG_LIBSSH_PROTOCOL)   += libssh.o
 OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index dabfa34..02bb16a 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -411,7 +411,6 @@ void av_register_all(void)
 REGISTER_DEMUXER (LIBGME,   libgme);
 REGISTER_DEMUXER (LIBMODPLUG,   libmodplug);
 REGISTER_MUXDEMUX(LIBNUT,   libnut);
-REGISTER_DEMUXER (LIBQUVI,  libquvi);
 REGISTER_PROTOCOL(LIBRTMP,  librtmp);
 REGISTER_PROTOCOL(LIBRTMPE, librtmpe);
 REGISTER_PROTOCOL(LIBRTMPS, librtmps);
diff --git a/libavformat/libquvi.c b/libavformat/libquvi.c
deleted file mode 100644
index 1e5c8bc..000
--- a/libavformat/libquvi.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2013 Clément Bœsch
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it wi

[FFmpeg-cvslog] lavfi: recognize GBR9-14P as RGB in ff_fill_rgba_map().

2016-01-24 Thread Ronald S. Bultje 
ffmpeg | branch: master | Ronald S. Bultje  | Thu Jan 21 
09:28:30 2016 -0500| [9cf81e573c70c70218c5d0d99063ebf06c012676] | committer: 
Ronald S. Bultje

lavfi: recognize GBR9-14P as RGB in ff_fill_rgba_map().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cf81e573c70c70218c5d0d99063ebf06c012676
---

 libavfilter/drawutils.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 3257192..f9a5eb8 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -52,6 +52,10 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat 
pix_fmt)
 case AV_PIX_FMT_BGRA:
 case AV_PIX_FMT_BGR0:
 case AV_PIX_FMT_BGR24: rgba_map[BLUE ] = 0; rgba_map[GREEN] = 1; 
rgba_map[RED  ] = 2; rgba_map[ALPHA] = 3; break;
+case AV_PIX_FMT_GBRP9:
+case AV_PIX_FMT_GBRP10:
+case AV_PIX_FMT_GBRP12:
+case AV_PIX_FMT_GBRP14:
 case AV_PIX_FMT_GBRAP:
 case AV_PIX_FMT_GBRP:  rgba_map[GREEN] = 0; rgba_map[BLUE ] = 1; 
rgba_map[RED  ] = 2; rgba_map[ALPHA] = 3; break;
 default:/* unsupported */

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/vf_zoompan: rewrite so it doesn't cache all output frames

2016-01-24 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Jan 24 11:38:15 
2016 +0100| [3b9f41a9c681386e6a73c56debcd70ff47744123] | committer: Paul B Mahol

avfilter/vf_zoompan: rewrite so it doesn't cache all output frames

Signed-off-by: Paul B Mahol 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b9f41a9c681386e6a73c56debcd70ff47744123
---

 libavfilter/vf_zoompan.c |  258 --
 1 file changed, 155 insertions(+), 103 deletions(-)

diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index c65ce56..0dc5f37 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
@@ -85,6 +86,12 @@ typedef struct ZPcontext {
 int prev_nb_frames;
 struct SwsContext *sws;
 int64_t frame_count;
+const AVPixFmtDescriptor *desc;
+AVFrame *in;
+double var_values[VARS_NB];
+int nb_frames;
+int current_frame;
+int finished;
 } ZPContext;
 
 #define OFFSET(x) offsetof(ZPContext, x)
@@ -116,141 +123,184 @@ static int config_output(AVFilterLink *outlink)
 
 outlink->w = s->w;
 outlink->h = s->h;
+s->desc = av_pix_fmt_desc_get(outlink->format);
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double 
*var_values, int i,
+   double *zoom, double *dx, double *dy)
 {
-AVFilterContext *ctx = inlink->dst;
-AVFilterLink *outlink = ctx->outputs[0];
 ZPContext *s = ctx->priv;
-double var_values[VARS_NB], nb_frames, zoom, dx, dy;
-const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in->format);
-AVFrame *out = NULL;
-int i, k, x, y, w, h, ret = 0;
-
-var_values[VAR_IN_W]  = var_values[VAR_IW] = in->width;
-var_values[VAR_IN_H]  = var_values[VAR_IH] = in->height;
-var_values[VAR_OUT_W] = var_values[VAR_OW] = s->w;
-var_values[VAR_OUT_H] = var_values[VAR_OH] = s->h;
-var_values[VAR_IN]= inlink->frame_count + 1;
-var_values[VAR_ON]= outlink->frame_count + 1;
-var_values[VAR_PX]= s->x;
-var_values[VAR_PY]= s->y;
-var_values[VAR_X] = 0;
-var_values[VAR_Y] = 0;
-var_values[VAR_PZOOM] = s->prev_zoom;
-var_values[VAR_ZOOM]  = 1;
-var_values[VAR_PDURATION] = s->prev_nb_frames;
-var_values[VAR_A] = (double) in->width / in->height;
-var_values[VAR_SAR]   = inlink->sample_aspect_ratio.num ?
-(double) inlink->sample_aspect_ratio.num / 
inlink->sample_aspect_ratio.den : 1;
-var_values[VAR_DAR]   = var_values[VAR_A] * var_values[VAR_SAR];
-var_values[VAR_HSUB]  = 1 << desc->log2_chroma_w;
-var_values[VAR_VSUB]  = 1 << desc->log2_chroma_h;
+AVFilterLink *outlink = ctx->outputs[0];
+int64_t pts = av_rescale_q(in->pts, ctx->inputs[0]->time_base,
+   outlink->time_base) + s->frame_count;
+int k, x, y, w, h, ret = 0;
+uint8_t *input[4];
+int px[4], py[4];
+AVFrame *out;
+
+var_values[VAR_TIME] = pts * av_q2d(outlink->time_base);
+var_values[VAR_FRAME] = i;
+var_values[VAR_ON] = outlink->frame_count + 1;
+if ((ret = av_expr_parse_and_eval(zoom, s->zoom_expr_str,
+  var_names, var_values,
+  NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 
0)
+return ret;
 
-if ((ret = av_expr_parse_and_eval(&nb_frames, s->duration_expr_str,
+*zoom = av_clipd(*zoom, 1, 10);
+var_values[VAR_ZOOM] = *zoom;
+w = in->width * (1.0 / *zoom);
+h = in->height * (1.0 / *zoom);
+
+if ((ret = av_expr_parse_and_eval(dx, s->x_expr_str,
   var_names, var_values,
   NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 
0)
-goto fail;
-
-var_values[VAR_DURATION] = nb_frames;
-for (i = 0; i < nb_frames; i++) {
-int px[4];
-int py[4];
-uint8_t *input[4];
-int64_t pts = av_rescale_q(in->pts, inlink->time_base,
-   outlink->time_base) + s->frame_count;
-
-var_values[VAR_TIME] = pts * av_q2d(outlink->time_base);
-var_values[VAR_FRAME] = i;
-var_values[VAR_ON] = outlink->frame_count + 1;
-if ((ret = av_expr_parse_and_eval(&zoom, s->zoom_expr_str,
-  var_names, var_values,
-  NULL, NULL, NULL, NULL, NULL, 0, 
ctx)) < 0)
-goto fail;
+return ret;
+x = *dx = av_clipd(*dx, 0, FFMAX(in->width - w, 0));
+var_values[VAR_X] = *dx;
+x &= ~((1 << s->desc->log2_chroma_w) - 1);
 
-zoom = av_clipd(zoom, 1, 10);
-var_values[VAR_ZOOM] = zoom;
-w = in->widt

[FFmpeg-cvslog] configure: Maintain alphabetical order of components

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Sun Jan 24 
09:28:55 2016 -0800| [fe71fde24685b5da052f38c9cd3522714de6d6ab] | committer: 
Timothy Gu

configure: Maintain alphabetical order of components

This is not "pure" alphabetical order since some components are
intentionally kept together.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe71fde24685b5da052f38c9cd3522714de6d6ab
---

 configure |   66 ++---
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/configure b/configure
index 35e3513..6fdb5dd 100755
--- a/configure
+++ b/configure
@@ -1907,9 +1907,9 @@ TOOLCHAIN_FEATURES="
 gnu_as
 gnu_windres
 ibm_asm
+inline_asm_direct_symbol_refs
 inline_asm_labels
 inline_asm_nonlocal_labels
-inline_asm_direct_symbol_refs
 pragma_deprecated
 rsync_contimeout
 symver_asm_label
@@ -1955,9 +1955,8 @@ HAVE_LIST="
 $TYPES_LIST
 atomics_native
 dos_paths
-dxva2api_cobj
 dxva2_lib
-winrt
+dxva2api_cobj
 libc_msvcrt
 libdc1394_1
 libdc1394_2
@@ -1971,6 +1970,7 @@ HAVE_LIST="
 threads
 vaapi_x11
 vdpau_x11
+winrt
 xlib
 "
 
@@ -2010,8 +2010,8 @@ CONFIG_EXTRA="
 intrax8
 ividsp
 jpegtables
-libx262
 lgplv3
+libx262
 llauddsp
 llviddsp
 lpc
@@ -2226,7 +2226,6 @@ faanidct_deps="faan idctdsp"
 frame_thread_encoder_deps="encoders threads"
 intrax8_select="error_resilience"
 mdct_select="fft"
-rdft_select="fft"
 me_cmp_select="fdctdsp idctdsp pixblockdsp"
 mpeg_er_select="error_resilience"
 mpegaudio_select="mpegaudiodsp"
@@ -2235,6 +2234,7 @@ mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp 
me_cmp mpeg_er videodsp"
 mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
 qsvdec_select="qsv"
 qsvenc_select="qsv"
+rdft_select="fft"
 
 # decoders / encoders
 aac_decoder_select="imdct15 mdct sinewin"
@@ -2296,10 +2296,10 @@ ffvhuff_encoder_select="huffyuv_encoder"
 fic_decoder_select="golomb"
 flac_decoder_select="flacdsp golomb"
 flac_encoder_select="bswapdsp flacdsp golomb lpc"
+flashsv2_decoder_select="zlib"
+flashsv2_encoder_select="zlib"
 flashsv_decoder_select="zlib"
 flashsv_encoder_select="zlib"
-flashsv2_encoder_select="zlib"
-flashsv2_decoder_select="zlib"
 flv_decoder_select="h263_decoder"
 flv_encoder_select="h263_encoder"
 fourxm_decoder_select="blockdsp bswapdsp"
@@ -2323,9 +2323,9 @@ hap_decoder_select="snappy texturedsp"
 hap_encoder_deps="libsnappy"
 hap_encoder_select="texturedspenc"
 hevc_decoder_select="bswapdsp cabac golomb videodsp"
-hevc_qsv_encoder_deps="libmfx"
 hevc_qsv_decoder_deps="libmfx"
 hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec 
hevc_qsv_hwaccel"
+hevc_qsv_encoder_deps="libmfx"
 hevc_qsv_encoder_select="qsvenc"
 huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
@@ -2395,8 +2395,8 @@ prores_decoder_select="blockdsp idctdsp"
 prores_encoder_select="fdctdsp"
 qcelp_decoder_select="lsp"
 qdm2_decoder_select="mdct rdft mpegaudiodsp"
-ra_144_encoder_select="audio_frame_queue lpc audiodsp"
 ra_144_decoder_select="audiodsp"
+ra_144_encoder_select="audio_frame_queue lpc audiodsp"
 ralf_decoder_select="golomb"
 rawvideo_decoder_select="bswapdsp"
 rscc_decoder_select="zlib"
@@ -2436,9 +2436,9 @@ utvideo_decoder_select="bswapdsp"
 utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
 vble_decoder_select="huffyuvdsp"
 vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 qpeldsp startcode"
-vc1image_decoder_select="vc1_decoder"
 vc1_qsv_decoder_deps="libmfx"
 vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel"
+vc1image_decoder_select="vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
 vp3_decoder_select="hpeldsp vp3dsp videodsp"
@@ -2493,9 +2493,9 @@ h264_d3d11va_hwaccel_select="h264_decoder"
 h264_dxva2_hwaccel_deps="dxva2"
 h264_dxva2_hwaccel_select="h264_decoder"
 h264_mmal_decoder_deps="mmal"
-h264_mmal_hwaccel_deps="mmal"
 h264_mmal_decoder_select="h264_decoder"
 h264_mmal_encoder_deps="mmal"
+h264_mmal_hwaccel_deps="mmal"
 h264_qsv_hwaccel_deps="libmfx"
 h264_vaapi_hwaccel_deps="vaapi"
 h264_vaapi_hwaccel_select="h264_decoder"
@@ -2538,8 +2538,8 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
 mpeg2_dxva2_hwaccel_deps="dxva2"
 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
 mpeg2_mmal_decoder_deps="mmal"
-mpeg2_mmal_hwaccel_deps="mmal"
 mpeg2_mmal_decoder_select="mpeg2video_decoder"
+mpeg2_mmal_hwaccel_deps="mmal"
 mpeg2_qsv_hwaccel_deps="libmfx"
 mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
 mpeg2_vaapi_hwaccel_deps="vaapi"
@@ -2565,17 +2565,17 @@ vc1_d3d11va_hwaccel_deps="d3d11va"
 vc1_d3d11va_hwaccel_select="vc1_decoder"
 vc1_dxva2_hwaccel_deps="dxva2"
 vc1_dxva2_hwaccel_select="vc1_decoder"
+vc1_mmal_decoder_deps="mmal"
+vc1_mmal_decoder_select="vc1_decoder"
+vc1_mmal_hwaccel_deps="mmal"
+vc1_qsv_hwaccel_deps="libmfx"
+vc1_qsv_hwaccel_select="qsvdec_vc1"
 vc1

[FFmpeg-cvslog] Changelog: Add entry on libquvi being removed

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Sun Jan 24 
09:45:11 2016 -0800| [794b015035a50ab1f709c49bdf5403b44a2dcbd6] | committer: 
Timothy Gu

Changelog: Add entry on libquvi being removed

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=794b015035a50ab1f709c49bdf5403b44a2dcbd6
---

 Changelog |1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog b/Changelog
index 8331816..6689951 100644
--- a/Changelog
+++ b/Changelog
@@ -58,6 +58,7 @@ version :
 - toggle full screen when double-clicking with the left mouse button in ffplay
 - afftfilt filter
 - convolution filter
+- libquvi support removed
 
 
 version 2.8:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/vf_zoompan: fix pts handling

2016-01-24 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Jan 24 19:57:56 
2016 +0100| [f42eae96b22d2f9a823bc616b2424164524eed96] | committer: Paul B Mahol

avfilter/vf_zoompan: fix pts handling

Now output pts have some sense.

Signed-off-by: Paul B Mahol 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f42eae96b22d2f9a823bc616b2424164524eed96
---

 doc/filters.texi |3 +++
 libavfilter/vf_zoompan.c |7 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 7f2c419..8545a2e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -12582,6 +12582,9 @@ single input image.
 
 @item s
 Set the output image size, default is 'hd720'.
+
+@item fps
+Set the output frame rate, default is '25'.
 @end table
 
 Each expression can contain the following constants:
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index fe8dc57..208d4d6 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -92,6 +92,7 @@ typedef struct ZPcontext {
 int nb_frames;
 int current_frame;
 int finished;
+AVRational framerate;
 } ZPContext;
 
 #define OFFSET(x) offsetof(ZPContext, x)
@@ -103,6 +104,7 @@ static const AVOption zoompan_options[] = {
 { "y", "set the y expression", OFFSET(y_expr_str), AV_OPT_TYPE_STRING, 
{.str="0"}, .flags = FLAGS },
 { "d", "set the duration expression", OFFSET(duration_expr_str), 
AV_OPT_TYPE_STRING, {.str="90"}, .flags = FLAGS },
 { "s", "set the output image size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, 
{.str="hd720"}, .flags = FLAGS },
+{ "fps", "set the output framerate", OFFSET(framerate), 
AV_OPT_TYPE_VIDEO_RATE, { .str = "25" }, .flags = FLAGS },
 { NULL }
 };
 
@@ -123,6 +125,8 @@ static int config_output(AVFilterLink *outlink)
 
 outlink->w = s->w;
 outlink->h = s->h;
+outlink->time_base = av_inv_q(s->framerate);
+outlink->frame_rate = s->framerate;
 s->desc = av_pix_fmt_desc_get(outlink->format);
 
 return 0;
@@ -133,8 +137,7 @@ static int output_single_frame(AVFilterContext *ctx, 
AVFrame *in, double *var_va
 {
 ZPContext *s = ctx->priv;
 AVFilterLink *outlink = ctx->outputs[0];
-int64_t pts = av_rescale_q(in->pts, ctx->inputs[0]->time_base,
-   outlink->time_base) + s->frame_count;
+int64_t pts = s->frame_count;
 int k, x, y, w, h, ret = 0;
 uint8_t *input[4];
 int px[4], py[4];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/vf_zoompan: unbreak filtering with video input

2016-01-24 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Jan 24 19:12:33 
2016 +0100| [8a343443796a334bd8aa5b342daf5e48049f333f] | committer: Paul B Mahol

avfilter/vf_zoompan: unbreak filtering with video input

Inserting fifo appears to be working solution to not get
filter_frame request we do not want.

Signed-off-by: Paul B Mahol 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a343443796a334bd8aa5b342daf5e48049f333f
---

 libavfilter/vf_zoompan.c |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index 0dc5f37..fe8dc57 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -221,10 +221,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 double nb_frames;
 int ret;
 
-if (s->in) {
-av_frame_free(&in);
-return 0;
-}
+av_assert0(s->in == NULL);
 
 s->finished = 0;
 s->var_values[VAR_IN_W]  = s->var_values[VAR_IW] = in->width;
@@ -336,6 +333,7 @@ static const AVFilterPad inputs[] = {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
+.needs_fifo   = 1,
 },
 { NULL }
 };

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Revert "decklink: Header cleanup"

2016-01-24 Thread Timothy Gu 
ffmpeg | branch: master | Timothy Gu  | Sun Jan 24 
12:42:39 2016 -0800| [ce36cb08ed46ae03cb2286b3f8d107e3eaa6a625] | committer: 
Timothy Gu

Revert "decklink: Header cleanup"

This reverts commit 61fb70c3866b19dccf473ad4e5ede79d117e8e1c.

Reported in #5183 to break the build. Further investigation needed.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce36cb08ed46ae03cb2286b3f8d107e3eaa6a625
---

 libavdevice/decklink_common.cpp |4 
 libavdevice/decklink_common.h   |8 +---
 libavdevice/decklink_common_c.h |2 --
 libavdevice/decklink_dec.cpp|4 
 libavdevice/decklink_dec.h  |2 --
 libavdevice/decklink_enc.cpp|4 
 libavdevice/decklink_enc.h  |2 --
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index 58502ee..ac7964c 100644
--- a/libavdevice/decklink_common.cpp
+++ b/libavdevice/decklink_common.cpp
@@ -26,7 +26,11 @@
 #include 
 #endif
 
+#include 
+#include 
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index c7e3ef2..3bc30f0 100644
--- a/libavdevice/decklink_common.h
+++ b/libavdevice/decklink_common.h
@@ -19,15 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include 
-#include 
-#include 
-
-extern "C" {
-#include "libavformat/avformat.h"
+#include 
 
 #include "decklink_common_c.h"
-}
 
 class decklink_output_callback;
 class decklink_input_callback;
diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h
index 3644fb4..fb2b788 100644
--- a/libavdevice/decklink_common_c.h
+++ b/libavdevice/decklink_common_c.h
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/log.h"
-
 struct decklink_cctx {
 const AVClass *cclass;
 
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 4bbc92e..6c5bc5d 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -21,7 +21,11 @@
 
 #include 
 
+#include 
+#include 
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h
index c499bc9..6bd9226 100644
--- a/libavdevice/decklink_dec.h
+++ b/libavdevice/decklink_dec.h
@@ -23,8 +23,6 @@
 extern "C" {
 #endif
 
-#include "libavformat/avformat.h"
-
 int ff_decklink_read_header(AVFormatContext *avctx);
 int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_read_close(AVFormatContext *avctx);
diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 334c3dc..6c5450f 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -21,7 +21,11 @@
 
 #include 
 
+#include 
+#include 
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h
index 23c59a2..6086947 100644
--- a/libavdevice/decklink_enc.h
+++ b/libavdevice/decklink_enc.h
@@ -23,8 +23,6 @@
 extern "C" {
 #endif
 
-#include "libavformat/avformat.h"
-
 int ff_decklink_write_header(AVFormatContext *avctx);
 int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_write_trailer(AVFormatContext *avctx);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/flacenc: fix calculation of bits required in case of custom sample rate

2016-01-24 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Jan 24 20:47:49 
2016 +0100| [3e7d6849120d61bb354376d52786c26f20e20835] | committer: Paul B Mahol

avcodec/flacenc: fix calculation of bits required in case of custom sample rate

Sample rate of 11025 takes 16 bits but previous code would pick only 8.
Fixes assertion failure.

Reviewed-by: Rostislav Pehlivanov 
Signed-off-by: Paul B Mahol 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e7d6849120d61bb354376d52786c26f20e20835
---

 libavcodec/flacenc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 5db043a..c769833 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1023,7 +1023,7 @@ static int count_frame_header(FlacEncodeContext *s)
 count += 16;
 
 /* explicit sample rate */
-count += ((s->sr_code[0] == 12) + (s->sr_code[0] > 12)) * 8;
+count += ((s->sr_code[0] == 12) + (s->sr_code[0] > 12) * 2) * 8;
 
 /* frame header CRC-8 */
 count += 8;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/hls: Check that filename is not "" in probe before checking its extension

2016-01-24 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jan 24 20:07:48 2016 +0100| [cde57eee98d2e26daeeb1ba0cdd1f3d3acb3eb8a] | 
committer: Michael Niedermayer

avformat/hls: Check that filename is not "" in probe before checking its 
extension

Possibly the check as a whole causes more problems than it helps, if so dont
hesitate to remove it

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde57eee98d2e26daeeb1ba0cdd1f3d3acb3eb8a
---

 libavformat/hls.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 846d884..dce8a5c 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1984,7 +1984,7 @@ static int hls_probe(AVProbeData *p)
 if (strncmp(p->buf, "#EXTM3U", 7))
 return 0;
 
-if (p->filename && !av_match_ext(p->filename, "m3u8,m3u"))
+if (p->filename && *p->filename && !av_match_ext(p->filename, "m3u8,m3u"))
 return 0;
 
 if (strstr(p->buf, "#EXT-X-STREAM-INF:") ||

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/webp: fix decoder dependencies

2016-01-24 Thread James Almer 
ffmpeg | branch: master | James Almer  | Sun Jan 24 20:30:33 
2016 -0300| [1d8f9b7d1ad2a58f612b47e769d00e6f8891d881] | committer: James Almer

avcodec/webp: fix decoder dependencies

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d8f9b7d1ad2a58f612b47e769d00e6f8891d881
---

 configure   |2 +-
 libavcodec/Makefile |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 6fdb5dd..0685133 100755
--- a/configure
+++ b/configure
@@ -2449,7 +2449,7 @@ vp6f_decoder_select="vp6_decoder"
 vp7_decoder_select="h264pred videodsp vp8dsp"
 vp8_decoder_select="h264pred videodsp vp8dsp"
 vp9_decoder_select="videodsp vp9_parser"
-webp_decoder_select="vp8_decoder"
+webp_decoder_select="vp8_decoder exif"
 wmalossless_decoder_select="llauddsp"
 wmapro_decoder_select="mdct sinewin wma_freqs"
 wmav1_decoder_select="mdct sinewin wma_freqs"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b9ffdb9..472c662 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -561,8 +561,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
 OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
 OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
 OBJS-$(CONFIG_WAVPACK_ENCODER) += wavpackenc.o
-OBJS-$(CONFIG_WEBP_DECODER)+= vp8.o vp8dsp.o vp56rac.o
-OBJS-$(CONFIG_WEBP_DECODER)+= webp.o exif.o tiff_common.o
+OBJS-$(CONFIG_WEBP_DECODER)+= webp.o
 OBJS-$(CONFIG_WEBVTT_DECODER)  += webvttdec.o ass.o
 OBJS-$(CONFIG_WEBVTT_ENCODER)  += webvttenc.o ass_split.o
 OBJS-$(CONFIG_WMALOSSLESS_DECODER) += wmalosslessdec.o wma_common.o

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog