diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:18:17 +0100 |
commit | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (patch) | |
tree | f926b3af6429d0318cb785aacace2d1b967f0a35 /libavformat/cafdec.c | |
parent | a0fe1a25fa76809005cb90beb09e66cb7493b353 (diff) | |
parent | 7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 (diff) | |
download | ffmpeg-a94eba6f0c0666de8ccbc56c62112d7e5f1132be.tar.gz |
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>
Diffstat (limited to 'libavformat/cafdec.c')
0 files changed, 0 insertions, 0 deletions