diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:07:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:07:20 +0200 |
| commit | 9ae56b85b664f5067d0e165039303dd61e39f856 (patch) | |
| tree | 80f927c648ad2e340a541f7f674df844f5f312fb /libavfilter/avf_concat.c | |
| parent | bf66016e4c03257707e62a0c525a82b9e4fdbdae (diff) | |
| parent | d4d186d185df98492d8935a87c5b5cf369db9748 (diff) | |
| download | ffmpeg-9ae56b85b664f5067d0e165039303dd61e39f856.tar.gz | |
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
dsputil: Remove non-8bpp draw_edge
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions