Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:32:48 +0000 (15:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:32:48 +0000 (15:32 +0100)
commit15fe694e5ca13e217a643553fbd8e15b5fc865de
tree02afe639baac5afd4c8abd5aeef73d1c6ac0bc23
parent1034fbdf53003eb74ad30576d1f2205abc429357
parentb4679ecdbd80ae050094733f137ccd7ebf1316ab
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c