diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 10:06:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 10:21:36 +0200 |
| commit | 1906e00030b3f1cda2a5cf3abb3fcb08433eaa34 (patch) | |
| tree | 1ba606d41dbf6e49aa0902a4d5042b1881b48f37 /libavcodec/xbmdec.c | |
| parent | 32cde962969363bebc4ad49b770ffff39487d3f8 (diff) | |
| parent | 4370f65be8d714a0bc73047501027464aaa2466c (diff) | |
| download | ffmpeg-1906e00030b3f1cda2a5cf3abb3fcb08433eaa34.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g2meet: Respect cursor_stride properly everywhere
See: c88ac1e0233f34582312dc617261b9270b61df19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xbmdec.c')
0 files changed, 0 insertions, 0 deletions