[FFmpeg-cvslog] avformat/udp: Remove unused variable

2016-05-29 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May 29 12:35:14 2016 +0200| [cbd19881f7e45a1f98fe1c2ef085a343ed1d0a05] | 
committer: Michael Niedermayer

avformat/udp: Remove unused variable

Signed-off-by: Michael Niedermayer 

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

 libavformat/udp.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 648efc2..9499a72 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -1099,7 +1099,6 @@ static int udp_close(URLContext *h)
 #if HAVE_PTHREAD_CANCEL
 // Request close once writing is finished
 if (s->thread_started && !(h->flags & AVIO_FLAG_READ)) {
-int ret;
 pthread_mutex_lock(&s->mutex);
 s->close_req = 1;
 pthread_cond_signal(&s->cond);

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

[FFmpeg-cvslog] avfilter/vf_fieldhint: Assert that mode is valid

2016-05-29 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May 29 14:45:18 2016 +0200| [7ae4d574e87364620ac1832e538650af0bf6bf11] | 
committer: Michael Niedermayer

avfilter/vf_fieldhint: Assert that mode is valid

Its checked by the AVOption code
Fixes CID1355122
Fixes CID1355121

Signed-off-by: Michael Niedermayer 

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

 libavfilter/vf_fieldhint.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c
index bdba77f..739c1bf 100644
--- a/libavfilter/vf_fieldhint.c
+++ b/libavfilter/vf_fieldhint.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
@@ -180,6 +181,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 top= s->frame[1 + tf];
 bottom = s->frame[1 + bf];
 break;
+default:
+av_assert0(0);
 }
 
 switch (hint) {

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

[FFmpeg-cvslog] avutil/softfloat: Improve doxy for av_sub_sf() and av_sf2int()

2016-05-29 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May 29 14:44:27 2016 +0200| [52ca24bdd2d199cac0db7b1060d0ff54054186dc] | 
committer: Michael Niedermayer

avutil/softfloat: Improve doxy for av_sub_sf() and av_sf2int()

Signed-off-by: Michael Niedermayer 

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

 libavutil/softfloat.h |4 
 1 file changed, 4 insertions(+)

diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 1dd5bb7..a3b2238 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -160,6 +160,9 @@ static inline av_const SoftFloat av_add_sf(SoftFloat a, 
SoftFloat b){
 else return a;
 }
 
+/**
+ * @returns the difference of 2 SoftFloats.
+ */
 static inline av_const SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){
 return av_add_sf(a, (SoftFloat){ -b.mant, b.exp});
 }
@@ -180,6 +183,7 @@ static inline av_const SoftFloat av_int2sf(int v, int 
frac_bits){
 }
 
 /**
+ * Converts a SoftFloat to an integer.
  * Rounding is to -inf.
  */
 static inline av_const int av_sf2int(SoftFloat v, int frac_bits){

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

[FFmpeg-cvslog] avfilter/vf_fieldhint: Reorder operation to prevent hypothetical integer overflow

2016-05-29 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May 29 18:11:53 2016 +0200| [be96ebdcd795c0d5acd229251eea97f3c4bf6095] | 
committer: Michael Niedermayer

avfilter/vf_fieldhint: Reorder operation to prevent hypothetical integer 
overflow

Fixes CID1355110

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c
index 739c1bf..2b845e7 100644
--- a/libavfilter/vf_fieldhint.c
+++ b/libavfilter/vf_fieldhint.c
@@ -174,8 +174,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
 switch (s->mode) {
 case 0:
-top= s->frame[1 + tf - outlink->frame_count];
-bottom = s->frame[1 + bf - outlink->frame_count];
+top= s->frame[tf - outlink->frame_count + 1];
+bottom = s->frame[bf - outlink->frame_count + 1];
 break;
 case 1:
 top= s->frame[1 + tf];

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

[FFmpeg-cvslog] avfilter/f_loop: Fix leak on error

2016-05-29 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May 29 21:21:59 2016 +0200| [645f7c1ce547f247af56990e6306d08d3d6a6286] | 
committer: Michael Niedermayer

avfilter/f_loop: Fix leak on error

Fixes CID1355117

Signed-off-by: Michael Niedermayer 

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

 libavfilter/f_loop.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c
index d8eb692..00e0215 100644
--- a/libavfilter/f_loop.c
+++ b/libavfilter/f_loop.c
@@ -88,8 +88,10 @@ static int push_samples(AVFilterContext *ctx, int nb_samples)
 if (!out)
 return AVERROR(ENOMEM);
 ret = av_audio_fifo_peek_at(s->fifo, (void **)out->extended_data, 
out->nb_samples, s->current_sample);
-if (ret < 0)
+if (ret < 0) {
+av_frame_free(&out);
 return ret;
+}
 out->pts = s->pts;
 out->nb_samples = ret;
 s->pts += out->nb_samples;

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

[FFmpeg-cvslog] libavformat/movenc: remove unnecessary null check

2016-05-29 Thread Mark Reid 
ffmpeg | branch: master | Mark Reid  | Sun May 29 17:17:32 
2016 -0700| [d74cc6157478e1bfa25674488554d966801a78cb] | committer: Michael 
Niedermayer

libavformat/movenc: remove unnecessary null check

Fixes CID1361955

Signed-off-by: Michael Niedermayer 

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

 libavformat/movenc.c |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 49cd1bd..3a633a6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1894,9 +1894,7 @@ static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack 
*track)
 avio_w8(pb, nb_frames); /* Number of frames */
 avio_w8(pb, 0); /* Reserved */
 
-if (track->st)
-t = av_dict_get(track->st->metadata, "reel_name", NULL, 0);
-
+t = av_dict_get(track->st->metadata, "reel_name", NULL, 0);
 if (t && utf8len(t->value) && track->mode != MODE_MP4)
 mov_write_source_reference_tag(pb, track, t->value);
 else

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