Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 20:27:26 +0000 (21:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 20:27:44 +0000 (21:27 +0100)
commit6998400c618fb267acb6b7281418f3b89fcabc8a
tree387c05201268ebf28bf9811d55c226099347f138
parenta94eba6f0c0666de8ccbc56c62112d7e5f1132be
parentbf704132a51f5d838365158331d4e535e1df4c8e
Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

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

Conflicts:
avprobe.c
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffprobe.c
libavutil/file.c
libavutil/parseutils.c