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>

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 272370db2a940bb9740b7aadf251cae284f3d938..bb8ddef88ddbd11c73eb569ec39cdcd9c968064c 100644 (file)
--- 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 a6987619f7b47e03ec9514a2c0651d81a850fab1..7d0eab44acf5612deb9a53512f53d2382fa004a3 100644 (file)
--- 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 b36e86ecb1d67d6c92f68fe54c36f12cc0a6c830..c3d895f931886c765457755aba01da7e66aad230 100644 (file)
--- 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 ba664f6214d9171ed74bfdc4c000520c12ce01ac..e36b75081f1631d697bb05850b6238c59b50e00f 100644 (file)
--- 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 719d56c412b8f3068b140878011135632c4036c3..195c3eaa5ad6439f556e48e045f34f22fe3e25ee 100644 (file)
--- 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