diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 20:10:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 20:10:51 +0100 |
| commit | 68014c6ed98b5c90f4dc211429dd269ac727be4b (patch) | |
| tree | fb2cfa04c693bf20d69e065955937347f7a5de93 /libavformat/img2.c | |
| parent | 57e939d963800f8e6977d0238e6116c7d1b53315 (diff) | |
| parent | c3a0b3eb64be441ca897629e8ecd80d5b51fded7 (diff) | |
Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'
* commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7':
arm: build: Maintain decoder objects separate from infrastructure objects
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions