diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 10:48:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 10:59:22 +0200 |
| commit | 17513f4fb3c012bc3147ae33cb2d2c9fc9a6e564 (patch) | |
| tree | 3d5093f5ddd08c9abc79684c683c6334deaee8a9 /configure | |
| parent | 15d4965239a34756a6317c5c971df77a0c0053d0 (diff) | |
| parent | 8812a8057f539845f6801cafdf6c481a59e96b48 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: Remove a hack that can cause infinite loops
Conflicts:
libavcodec/h263dec.c
See: d2981b8ef191fc7876e3486e42222ab6a8777c24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions