Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 19:46:28 +0000 (21:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 19:50:34 +0000 (21:50 +0200)
commit3a4c22f8067fc4e9005e7dc781dff541abca472a
tree57c9f00ba18fec0249a06d47398114746ca86f5c
parent0b2f860db53e6274836036d3e3ff57f8d043aa0f
parent6d96c7ea89600655b1f18a3b12f3f041fa714152
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>
libavfilter/vf_showinfo.c