Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

5 files changed, 12 insertions, 20 deletions

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index fbf42f2080..af5db7a8d9 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -27,8 +27,6 @@
  * @todo support a PTS correction mechanism
  */
 
-/* #define DEBUG */
-
 #include <float.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 25dde7f162..f8ed427aca 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -77,9 +77,9 @@ static av_cold int init(AVFilterContext *ctx)
 
 static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
-    AspectContext *aspect = link->dst->priv;
+    AspectContext *s = link->dst->priv;
 
-    frame->sample_aspect_ratio = aspect->aspect;
+    frame->sample_aspect_ratio = s->aspect;
     return ff_filter_frame(link->dst->outputs[0], frame);
 }
 
@@ -99,15 +99,15 @@ static inline void compute_dar(AVRational *dar, AVRational sar, int w, int h)
 
 static int setdar_config_props(AVFilterLink *inlink)
 {
-    AspectContext *aspect = inlink->dst->priv;
-    AVRational dar = aspect->aspect, old_dar;
+    AspectContext *s = inlink->dst->priv;
+    AVRational dar = s->aspect, old_dar;
     AVRational old_sar = inlink->sample_aspect_ratio;
 
-    if (aspect->aspect.num && aspect->aspect.den) {
-        av_reduce(&aspect->aspect.num, &aspect->aspect.den,
-                   aspect->aspect.num * inlink->h,
-                   aspect->aspect.den * inlink->w, INT_MAX);
-        inlink->sample_aspect_ratio = aspect->aspect;
+    if (s->aspect.num && s->aspect.den) {
+        av_reduce(&s->aspect.num, &s->aspect.den,
+                   s->aspect.num * inlink->h,
+                   s->aspect.den * inlink->w, INT_MAX);
+        inlink->sample_aspect_ratio = s->aspect;
     } else {
         inlink->sample_aspect_ratio = (AVRational){ 1, 1 };
         dar = (AVRational){ inlink->w, inlink->h };
@@ -171,14 +171,14 @@ AVFilter avfilter_vf_setdar = {
 
 static int setsar_config_props(AVFilterLink *inlink)
 {
-    AspectContext *aspect = inlink->dst->priv;
+    AspectContext *s = inlink->dst->priv;
     AVRational old_sar = inlink->sample_aspect_ratio;
     AVRational old_dar, dar;
 
-    inlink->sample_aspect_ratio = aspect->aspect;
+    inlink->sample_aspect_ratio = s->aspect;
 
     compute_dar(&old_dar, old_sar, inlink->w, inlink->h);
-    compute_dar(&dar, aspect->aspect, inlink->w, inlink->h);
+    compute_dar(&dar, s->aspect, inlink->w, inlink->h);
     av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n",
            inlink->w, inlink->h, old_sar.num, old_sar.den, old_dar.num, old_dar.den,
            inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, dar.num, dar.den);
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 72137def19..3b20ee5a24 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -23,8 +23,6 @@
  * video crop filter
  */
 
-/* #define DEBUG */
-
 #include <stdio.h>
 
 #include "avfilter.h"
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 345509bd44..ce2be64ad1 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -22,8 +22,6 @@
  * frei0r wrapper
  */
 
-/* #define DEBUG */
-
 #include <dlfcn.h>
 #include <frei0r.h>
 #include <stdio.h>
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index b731a1f6b0..22d2407f82 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -23,8 +23,6 @@
  * libopencv wrapper functions
  */
 
-/* #define DEBUG */
-
 #include <opencv/cv.h>
 #include <opencv/cxcore.h>
 #include "libavutil/avstring.h"