[FFmpeg-cvslog] Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
Michael Niedermayer
git at videolan.org
Thu Jun 12 21:11:55 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 12 20:25:48 2014 +0200| [c600c8e966996555724d574e26f9e95259b1f884] | committer: Michael Niedermayer
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
Conflicts:
libavcodec/ac3enc_float.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c600c8e966996555724d574e26f9e95259b1f884
---
More information about the ffmpeg-cvslog
mailing list