diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-14 00:35:37 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:10 -0300 |
| commit | e83717e63eab1f1b78dc0990e5b8e927097fca29 (patch) | |
| tree | d3398f8f2ea1548188300fa4d939317f8a46ff9d | |
| parent | 0a071f7124beaf0929f772a8618ac1b6c17b0222 (diff) | |
avformat: Switch AVChapter.id to 64bits
Announced in e318438f2f30525d8baca2b5683aa9898d0c56f7.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/internal.h | 4 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
5 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 272370db2a..bb8ddef88d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1092,11 +1092,7 @@ typedef struct AVProgram { change dynamically at runtime. */ typedef struct AVChapter { -#if FF_API_CHAPTER_ID_INT - int id; ///< unique ID to identify the chapter -#else int64_t id; ///< unique ID to identify the chapter -#endif AVRational time_base; ///< time base in which the start/end timestamps are specified int64_t start, end; ///< chapter start/end time in time_base units AVDictionary *metadata; diff --git a/libavformat/internal.h b/libavformat/internal.h index a6987619f7..7d0eab44ac 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -579,11 +579,7 @@ void ff_configure_buffers_for_index(AVFormatContext *s, int64_t time_tolerance); * * @return AVChapter or NULL on error */ -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title); /** diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b36e86ecb1..c3d895f931 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1671,11 +1671,7 @@ static int mkv_write_chapters(AVFormatContext *s) int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale); int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); const AVDictionaryEntry *t; -#if FF_API_CHAPTER_ID_INT - uint64_t uid = create_new_ids ? i + 1ULL : (uint32_t)c->id; -#else uint64_t uid = create_new_ids ? i + 1ULL : c->id; -#endif if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) { av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n", diff --git a/libavformat/utils.c b/libavformat/utils.c index ba664f6214..e36b75081f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4589,11 +4589,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) return program; } -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title) { AVChapter *chapter = NULL; diff --git a/libavformat/version.h b/libavformat/version.h index 719d56c412..195c3eaa5a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CHAPTER_ID_INT -#define FF_API_CHAPTER_ID_INT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #endif |