Changeset a94eba6f in ffmpeg

Timestamp:

Feb 14, 2015, 8:18:17 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6998400c

Parents:

a0fe1a25 (diff), 7f9f771 (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 '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'

• commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0': avcodec: Don't anonymously typedef structs

Conflicts:

libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c

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

(No files)