diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 11:06:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 11:06:26 +0200 |
| commit | 200ef1e3c389a17b61639bbc2c0e1a9123fedb42 (patch) | |
| tree | 452e452cc3f5fa1cea4aadbf50b332cdef1e8858 /libavcodec/a64multienc.c | |
| parent | d9cde3976c194688a1f7d16dcb4671eb11422876 (diff) | |
| parent | 9f30fb5a773d59298d8d45c741b3fd971d84c97b (diff) | |
| download | ffmpeg-200ef1e3c389a17b61639bbc2c0e1a9123fedb42.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/a64multienc.c')
0 files changed, 0 insertions, 0 deletions