Changeset a0fe1a25 in ffmpeg

Timestamp:

Feb 14, 2015, 8:07:40 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a94eba6f

Parents:

4ab7eb0d (diff), daf8cf35 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)