[FFmpeg-cvslog] Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
Michael Niedermayer
git at videolan.org
Fri Oct 19 13:36:23 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 19 13:29:24 2012 +0200| [b0554fec0470bf59b0582c80697d28646e37b854] | committer: Michael Niedermayer
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0554fec0470bf59b0582c80697d28646e37b854
---
More information about the ffmpeg-cvslog
mailing list