diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:40:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:41:02 +0100 |
| commit | 158cf1d52df6d91580d6b74e55db8ffdbaf24011 (patch) | |
| tree | 1d7b6e87c46024fa0f13713e10514f7b5453e150 | |
| parent | 6fd7456f85720e8a6fdfacd365d14738d2e272b8 (diff) | |
| parent | 2496dbd68b29bd36fbf4753a46163d33f6dae70e (diff) | |
| download | ffmpeg-158cf1d52df6d91580d6b74e55db8ffdbaf24011.tar.gz | |
Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4
* commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e':
vf_showinfo: Forward the av_image_get_linesize error
Conflicts:
libavfilter/vf_showinfo.c
See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_showinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 8201c2d44a..aa3bc83090 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -86,9 +86,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int i, plane, vsub = desc->log2_chroma_h; for (plane = 0; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++) { - int64_t linesize = av_image_get_linesize(frame->format, frame->width, plane); uint8_t *data = frame->data[plane]; int h = plane == 1 || plane == 2 ? FF_CEIL_RSHIFT(inlink->h, vsub) : inlink->h; + int linesize = av_image_get_linesize(frame->format, frame->width, plane); if (linesize < 0) return linesize; |