Skip to content
Snippets Groups Projects
Commit a0fe1a25 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'daf8cf35'


* commit 'daf8cf35':
  avformat: Don't anonymously typedef structs

Conflicts:
	libavformat/adtsenc.c
	libavformat/aiffenc.c
	libavformat/avidec.c
	libavformat/gif.c
	libavformat/iff.c
	libavformat/img2dec.c
	libavformat/jvdec.c
	libavformat/matroskadec.c
	libavformat/udp.c
	libavformat/wtvdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4ab7eb0d daf8cf35
No related branches found
No related tags found
No related merge requests found
Showing with 24 additions and 24 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment