diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:58:39 +0200 |
| commit | f1b5693027d48a9e448f21595fb9247893c225cf (patch) | |
| tree | d01e1b5a8a3abe464cd5be4d86122f0818b60132 /libavfilter/src_movie.c | |
| parent | a2b66a366d7d9d7dacc217601b5e4406624f91ea (diff) | |
| parent | 0ca36b4de76e10578e23199c2932682c0f510e31 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM muxer
v210enc: clip values according to specifications
v210enc: switch to PIX_FMT_422P10
v210dec: switch to PIX_FMT_422P10
AVOptions: remove AVOption.offset <= 0 checks
AVOptions: deprecate av_opt_set_defaults2
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
libx264: fix setting some more parameters
libx264: fix setting the H.264 level
libx264: add 'direct-pred' private option
libx264: add 'partitions' private option
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/src_movie.c')
| -rw-r--r-- | libavfilter/src_movie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 0f683db0b2..c266654536 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -97,7 +97,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx, const char *args, voi int ret; movie->class = &movie_class; - av_opt_set_defaults2(movie, 0, 0); + av_opt_set_defaults(movie); if (args) movie->file_name = av_get_token(&args, ":"); |