diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:58:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:58:00 +0200 |
| commit | 877716a79c9d649624b67b1fa328825e2c055cc9 (patch) | |
| tree | fd7ef8f7f7919eb819809ca575abcf642950f7d5 /doc/examples | |
| parent | 5a55d5e44575ea70c20dfea108c8cc038e1463c5 (diff) | |
| parent | 6a927d7aaf5625e83a674072913b9e292a303fd1 (diff) | |
| download | ffmpeg-877716a79c9d649624b67b1fa328825e2c055cc9.tar.gz | |
Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
output example: use a macro instead of a static variable
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/muxing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index df3e314951..7becfcdfac 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -49,7 +49,7 @@ static int audio_is_eof, video_is_eof; #define STREAM_FRAME_RATE 25 /* 25 images/s */ #define STREAM_PIX_FMT AV_PIX_FMT_YUV420P /* default pix_fmt */ -static int sws_flags = SWS_BICUBIC; +#define SCALE_FLAGS SWS_BICUBIC // a wrapper around a single output AVStream typedef struct OutputStream { @@ -423,7 +423,7 @@ static void write_video_frame(AVFormatContext *oc, OutputStream *ost, int flush) if (!sws_ctx) { sws_ctx = sws_getContext(c->width, c->height, AV_PIX_FMT_YUV420P, c->width, c->height, c->pix_fmt, - sws_flags, NULL, NULL, NULL); + SCALE_FLAGS, NULL, NULL, NULL); if (!sws_ctx) { fprintf(stderr, "Could not initialize the conversion context\n"); |