diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 03:37:28 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 03:37:28 +0400 |
| commit | 16f619f57c07f518d4d9fa8de3f23540174ff8ef (patch) | |
| tree | 7ecc4d2a9e5bef02196731b15feb911b0b6bbe9e /libavcodec/error_resilience.c | |
| parent | dd7c2e9bce0ca704c6dd725cb7b1cb3bedacdb75 (diff) | |
| parent | 635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150 (diff) | |
Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'
* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
dsputil: Merge variable declarations and initializations
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
0 files changed, 0 insertions, 0 deletions