[FFmpeg-cvslog] Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 21:27:26 2015 +0100| [6998400c618fb267acb6b7281418f3b89fcabc8a] | committer: Michael Niedermayer

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
  Don't anonymously typedef structs

Conflicts:
	avprobe.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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