1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer a0fe1a25fa Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  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: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 21:07:40 +01:00
..
2014-12-18 00:10:35 +01:00
2015-01-15 17:09:39 +01:00
2015-01-30 09:33:49 +00:00
2015-02-06 20:44:36 +01:00
2014-12-18 23:27:07 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2014-10-21 03:52:27 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2014-10-22 23:12:38 +02:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00