diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 14:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 15:00:39 +0200 |
| commit | 15a0fb58a3294876c23989915a4a6202411be1b0 (patch) | |
| tree | 06270e6af9c4d446b75a573b39161664e60c6a13 /libavfilter/af_asyncts.c | |
| parent | bec180e1127f6753b5af1e6e5242020e0de12366 (diff) | |
| parent | 01cb4c84f54a52725c9b4b4dd6c609c36cccc5d4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Fix single symbol mode decoding
truespeech: drop useless casts
libavcodec: drop bogus dependencies from mpc[78] and qdm2
mpegaudio: move ff_mpa_enwindow to a separate file
AVOptions: store defaults for INT64 options in int64 union member.
Conflicts:
libavcodec/Makefile
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asyncts.c')
| -rw-r--r-- | libavfilter/af_asyncts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 9f16e8a4bd..aa3e287f75 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -51,7 +51,7 @@ static const AVOption asyncts_options[] = { { "min_delta", "Minimum difference between timestamps and audio data " "(in seconds) to trigger padding/trimmin the data.", OFFSET(min_delta_sec), AV_OPT_TYPE_FLOAT, { 0.1 }, 0, INT_MAX, A|F }, { "max_comp", "Maximum compensation in samples per second.", OFFSET(max_comp), AV_OPT_TYPE_INT, { 500 }, 0, INT_MAX, A|F }, - { "first_pts", "Assume the first pts should be this value.", OFFSET(pts), AV_OPT_TYPE_INT64, { AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, A|F }, + { "first_pts", "Assume the first pts should be this value.", OFFSET(pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, A|F }, { NULL }, }; |