[FFmpeg-cvslog] Merge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b'
Michael Niedermayer
git at videolan.org
Wed May 29 11:15:34 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 11:06:26 2013 +0200| [200ef1e3c389a17b61639bbc2c0e1a9123fedb42] | committer: Michael Niedermayer
Merge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b'
* commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b':
configure: Don't pass -mthumb or -march= to MSVC
mpeg12: skip frames consistently
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=200ef1e3c389a17b61639bbc2c0e1a9123fedb42
---
More information about the ffmpeg-cvslog
mailing list