[FFmpeg-cvslog] Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 15:32:48 2014 +0100| [15fe694e5ca13e217a643553fbd8e15b5fc865de] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15fe694e5ca13e217a643553fbd8e15b5fc865de
---