diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-09-26 18:13:55 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-29 14:33:00 +0200 |
| commit | 948f3c19a8bd069768ca411212aaf8c1ed96b10d (patch) | |
| tree | 159e78bd8057aa0d7ff10fac4577ce8bb5170576 /libavcodec/parser.c | |
| parent | d00bb8addccb63fa3feacb06d2a310731dc0113b (diff) | |
| download | ffmpeg-948f3c19a8bd069768ca411212aaf8c1ed96b10d.tar.gz | |
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Note that convergence_duration had another meaning, one which was in
practice never used. The only real use for it was a 64 bit replacement
for the duration field. It's better just to make duration 64 bits, and
to get rid of it.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 4671c13ae6..355187ae45 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -23,6 +23,7 @@ #include <stdint.h> #include <string.h> +#include "libavutil/internal.h" #include "libavutil/mem.h" #include "internal.h" @@ -86,7 +87,11 @@ found: s->fetch_timestamp = 1; s->pict_type = AV_PICTURE_TYPE_I; s->key_frame = -1; +#if FF_API_CONVERGENCE_DURATION +FF_DISABLE_DEPRECATION_WARNINGS s->convergence_duration = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif s->dts_sync_point = INT_MIN; s->dts_ref_dts_delta = INT_MIN; s->pts_dts_delta = INT_MIN; |