diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:05:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:05:40 +0200 |
| commit | 376b16d7cc8a0953bc2054a6ccc778d75b7b1c5b (patch) | |
| tree | 5969c6405a5e884d81377f63b68357130ea2be9a /ffmpeg.h | |
| parent | fb2e7ac3c4c4432928d10df072c3dd9c99558da9 (diff) | |
| parent | 0db2d94280e260af5f3ad7993c5a6357462f17c9 (diff) | |
| download | ffmpeg-376b16d7cc8a0953bc2054a6ccc778d75b7b1c5b.tar.gz | |
Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'
* commit '0db2d94280e260af5f3ad7993c5a6357462f17c9':
dsputil: workaround __VA_ARGS__ missing tokenization for MSVC
configure: add section for libc-specific hacks
build: disable ranlib on mingw
parser: Don't use pc as context for av_dlog
h264: Remove an assert on current_picture_ptr being null
Conflicts:
configure
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions