diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
| commit | 3c8493074bc43aced247a34d6b981e6f9acde0f1 (patch) | |
| tree | 99b7984ed8e49d397c4cb3dab184454e26e122f1 /ffmpeg.c | |
| parent | b0efaee6c1a07b4e7575bf523542ce846202b6e2 (diff) | |
| parent | 1500be13f204acb7e74dac4325ef0052576fa2a9 (diff) | |
| download | ffmpeg-3c8493074bc43aced247a34d6b981e6f9acde0f1.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
dsputil: allow to skip drawing of top/bottom edges.
Split fate-psx-str-v3 into a video-only and audio-only test.
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions