[FFmpeg-cvslog] Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'

Michael Niedermayer git at videolan.org
Sat Feb 14 21:26:15 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 21:18:17 2015 +0100| [a94eba6f0c0666de8ccbc56c62112d7e5f1132be] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a94eba6f0c0666de8ccbc56c62112d7e5f1132be
---





More information about the ffmpeg-cvslog mailing list