Michael Niedermayer 6998400c61 Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e' ...

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

Conflicts:
	avprobe.c
	libavutil/parseutils.c

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

2015-02-14 21:27:44 +01:00

5.3 KiB

Raw Blame History

View Raw