Michael Niedermayer
|
d46c1c72e4
|
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-09-05 14:33:32 +02:00 |
Stefano Sabatini
|
42d621d131
|
lavfi: add priv class to filter definitions and flags to filter internal options
This allows the iteration callbacks to discover the internal class and
options, and show them when required.
|
2012-08-18 10:19:05 +02:00 |
Nicolas George
|
de35d2b498
|
avf_concat: fix permissions.
|
2012-08-17 18:26:39 +02:00 |
|
Nicolas George
|
efcfcf8793
|
avf_concat: fix silence duration.
concat_in.pts starts at 0 for each segment, so the duration
of the silence was too long, except at the first stitch.
|
2012-07-28 15:14:01 +02:00 |
|
Nicolas George
|
9a757cca34
|
avf_concat: fix min value for v option.
|
2012-07-28 11:48:14 +02:00 |
|
Nicolas George
|
be33da9a1d
|
lavfi: add concat filter.
|
2012-07-23 11:34:20 +02:00 |