diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 12:41:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 12:41:27 +0100 |
| commit | fa09ad5c9e68bda47efddd357ed4715f7dab563b (patch) | |
| tree | 5b4d724baa255e7871c8c17712b651d2d29b16f6 /libavfilter/formats.c | |
| parent | cf10616cc0db272bab9206a2f0f921f965e379da (diff) | |
| parent | 9acd23d655b5e3a3b56f9916480356fe0e48c70c (diff) | |
| download | ffmpeg-fa09ad5c9e68bda47efddd357ed4715f7dab563b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Fix h263 loop filter link error in some configurations
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
0 files changed, 0 insertions, 0 deletions