[FFmpeg-cvslog] Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

Michael Niedermayer git at videolan.org
Mon May 6 10:27:19 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 10:19:56 2013 +0200| [5c2ccf83df3bfea03c843910c41ee99bd4d64129] | committer: Michael Niedermayer

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
	libavformat/rtpdec_xiph.c

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

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





More information about the ffmpeg-cvslog mailing list