diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 14:12:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 14:23:52 +0200 |
| commit | 76c1f9200fa3bf16a47042c0c2a1bd11e408b56c (patch) | |
| tree | c16437b77ee9ddfff2d7fb02f5aa33bf4f2f62fe /libavcodec/arm/dsputil_init_arm.c | |
| parent | 1a94d7c7c8ca2164c2a1e7d6f1fe7868b01e7e43 (diff) | |
| parent | a83c0da539fb07260310bc3b34056239d2b138b2 (diff) | |
| download | ffmpeg-76c1f9200fa3bf16a47042c0c2a1bd11e408b56c.tar.gz | |
Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2':
avconv: make -t insert trim/atrim filters.
The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.
Conflicts:
Changelog
ffmpeg.c
ffmpeg_filter.c
tests/ref/fate/bethsoft-vid
tests/ref/lavf/aiff
tests/ref/lavf/asf
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/dpx
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/jpg
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/pcx
tests/ref/lavf/png
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/wav
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_init_arm.c')
0 files changed, 0 insertions, 0 deletions