-
Michael Niedermayer authored
* commit 'b4679ecd': {v,a}f_showinfo: print frame side data Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
15fe694e
* commit 'b4679ecd': {v,a}f_showinfo: print frame side data Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>