diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-16 20:09:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-16 20:09:25 +0200 |
| commit | 21dfabfa6461e809fbfe205b94ded5f9d155e67b (patch) | |
| tree | 9372cf5f7397b1fa2ab61374651a0f69b7435da8 /libavformat/filmstripenc.c | |
| parent | 9bc0410e4f891719b54a5788665526e22d94bb50 (diff) | |
| parent | adff0a8166345bb9513f0f658043fb6387e90122 (diff) | |
| download | ffmpeg-21dfabfa6461e809fbfe205b94ded5f9d155e67b.tar.gz | |
Merge commit 'adff0a8166345bb9513f0f658043fb6387e90122'
* commit 'adff0a8166345bb9513f0f658043fb6387e90122':
arm: dsputil: Coalesce all init files
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/dsputil_arm.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/filmstripenc.c')
0 files changed, 0 insertions, 0 deletions