diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 21:46:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 21:50:34 +0200 |
| commit | 3a4c22f8067fc4e9005e7dc781dff541abca472a (patch) | |
| tree | 57c9f00ba18fec0249a06d47398114746ca86f5c /libavfilter | |
| parent | 0b2f860db53e6274836036d3e3ff57f8d043aa0f (diff) | |
| parent | 6d96c7ea89600655b1f18a3b12f3f041fa714152 (diff) | |
| download | ffmpeg-3a4c22f8067fc4e9005e7dc781dff541abca472a.tar.gz | |
Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
vf_showinfo: Forward the av_image_get_linesize error
Conflicts:
libavfilter/vf_showinfo.c
See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -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; |