Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

Conflicts:
	libavcodec/h264.c

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

1 files changed, 12 insertions, 12 deletions

diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 188609b4ec..d3123f503e 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -152,19 +152,19 @@ static int request_frame(AVFilterLink *link)
             handle_trimming(ctx);
 
         if (nb_samples = get_delay(s)) {
-        AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE,
-                                                     nb_samples);
-        if (!buf)
-            return AVERROR(ENOMEM);
-        ret = avresample_convert(s->avr, buf->extended_data,
-                                 buf->linesize[0], nb_samples, NULL, 0, 0);
-        if (ret <= 0) {
-            avfilter_unref_bufferp(&buf);
-            return (ret < 0) ? ret : AVERROR_EOF;
-        }
+            AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE,
+                                                         nb_samples);
+            if (!buf)
+                return AVERROR(ENOMEM);
+            ret = avresample_convert(s->avr, buf->extended_data,
+                                     buf->linesize[0], nb_samples, NULL, 0, 0);
+            if (ret <= 0) {
+                avfilter_unref_bufferp(&buf);
+                return (ret < 0) ? ret : AVERROR_EOF;
+            }
 
-        buf->pts = s->pts;
-        return ff_filter_frame(link, buf);
+            buf->pts = s->pts;
+            return ff_filter_frame(link, buf);
         }
     }