diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 12:05:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 12:10:57 +0200 |
| commit | 1ec578c010e74fcd899170b3fa8e4c25c4c2c479 (patch) | |
| tree | 8499e70eaf62a57c5478e5c1e39e6d7e9d7048a2 /libavutil/x86_cpu.h | |
| parent | 1a0057dc881c05365cbd7bfa71eeef7d5a519428 (diff) | |
| parent | 259af1b92370b32f6d0b9a6de314db4b44c2481d (diff) | |
| download | ffmpeg-1ec578c010e74fcd899170b3fa8e4c25c4c2c479.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/mpegvideo.c
See: 73db0bf1b06084022db5f42377b3b7960b3d3f5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86_cpu.h')
0 files changed, 0 insertions, 0 deletions