-
Michael Niedermayer authored
* commit '6d96c7ea': vf_showinfo: Forward the av_image_get_linesize error Conflicts: libavfilter/vf_showinfo.c See: 2aecfd4fMerged-by: Michael Niedermayer <michaelni@gmx.at>
3a4c22f8
* commit '6d96c7ea': vf_showinfo: Forward the av_image_get_linesize error Conflicts: libavfilter/vf_showinfo.c See: 2aecfd4fMerged-by: Michael Niedermayer <michaelni@gmx.at>