From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 18 May 2013 11:31:45 +0000 (+0200)
Subject: Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
X-Git-Tag: android-x86-4.4-r1~3453
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d56ced5fbf3c76ebd5c5b015695101c634e53e4a;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
  avfilter.c: cosmetics, reformat

Conflicts:
	libavfilter/avfilter.c

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

d56ced5fbf3c76ebd5c5b015695101c634e53e4a
diff --cc libavfilter/avfilter.c
index 5d5243d33d,95fc700dc2..c96c09c10d
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@@ -34,40 -32,10 +34,41 @@@
  #include "avfilter.h"
  #include "formats.h"
  #include "internal.h"
 -#include "video.h"
 +#include "audio.h"
 +
 +static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame);
 +
 +void ff_tlog_ref(void *ctx, AVFrame *ref, int end)
 +{
 +    av_unused char buf[16];
 +    ff_tlog(ctx,
 +            "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
 +            ref, ref->buf, ref->data[0],
 +            ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3],
 +            ref->pts, av_frame_get_pkt_pos(ref));
 +
 +    if (ref->width) {
 +        ff_tlog(ctx, " a:%d/%d s:%dx%d i:%c iskey:%d type:%c",
 +                ref->sample_aspect_ratio.num, ref->sample_aspect_ratio.den,
 +                ref->width, ref->height,
 +                !ref->interlaced_frame     ? 'P' :         /* Progressive  */
 +                ref->top_field_first ? 'T' : 'B',    /* Top / Bottom */
 +                ref->key_frame,
 +                av_get_picture_type_char(ref->pict_type));
 +    }
 +    if (ref->nb_samples) {
 +        ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
 +                ref->channel_layout,
 +                ref->nb_samples,
 +                ref->sample_rate);
 +    }
 +
 +    ff_tlog(ctx, "]%s", end ? "\n" : "");
 +}
  
- unsigned avfilter_version(void) {
+ unsigned avfilter_version(void)
+ {
 +    av_assert0(LIBAVFILTER_VERSION_MICRO >= 100);
      return LIBAVFILTER_VERSION_INT;
  }