← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavfilter/vf_pad.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavfilter/vf_pad.c
21
21
 
22
22
/**
23
23
 * @file
24
 
 * video padding filter and color source
 
24
 * video padding filter
25
25
 */
26
26
 
27
27
#include "avfilter.h"
32
32
#include "libavutil/avassert.h"
33
33
#include "libavutil/imgutils.h"
34
34
#include "libavutil/parseutils.h"
 
35
#include "libavutil/mathematics.h"
35
36
#include "drawutils.h"
36
37
 
37
38
static const char *var_names[] = {
157
158
    var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
158
159
    var_values[VAR_A]     = (float) inlink->w / inlink->h;
159
160
    var_values[VAR_HSUB]  = 1<<pad->hsub;
160
 
    var_values[VAR_VSUB]  = 2<<pad->vsub;
 
161
    var_values[VAR_VSUB]  = 1<<pad->vsub;
161
162
 
162
163
    /* evaluate width and height */
163
164
    av_expr_parse_and_eval(&res, (expr = pad->w_expr),