Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

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

Conflicts:
	avprobe.c
	libavutil/parseutils.c

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

1 files changed, 1 insertions, 1 deletions

diff --git a/libavutil/file.c b/libavutil/file.c
index 359d290e99..2a06be4398 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -35,7 +35,7 @@
 #include <windows.h>
 #endif
 
-typedef struct {
+typedef struct FileLogContext {
     const AVClass *class;
     int   log_offset;
     void *log_ctx;