[FFmpeg-cvslog] Allow >2G for skip_initial_bytes.

Carl Eugen Hoyos git at videolan.org
Fri Jun 6 14:27:07 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Jun  6 00:05:31 2014 +0200| [d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9] | committer: Carl Eugen Hoyos

Allow >2G for skip_initial_bytes.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9
---

 libavformat/avformat.h      |    2 +-
 libavformat/options_table.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 01c3b75..e56a0bc 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1498,7 +1498,7 @@ typedef struct AVFormatContext {
      * - encoding: unused
      * - decoding: Set by user via AVOptions (NO direct access)
      */
-    unsigned int skip_initial_bytes;
+    int64_t skip_initial_bytes;
 
     /**
      * Correct single timestamp overflows
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 069edee..36c0426 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -83,7 +83,7 @@ static const AVOption avformat_options[] = {
 {"disabled",            "do not change timestamps",                  0, AV_OPT_TYPE_CONST, {.i64 =  0 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
 {"make_zero",           "shift timestamps so they start at 0",       0, AV_OPT_TYPE_CONST, {.i64 =  2 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
 {"make_non_negative",   "shift timestamps so they are non negative", 0, AV_OPT_TYPE_CONST, {.i64 =  1 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"},
-{"skip_initial_bytes", "set number of bytes to skip before reading header and frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D},
+{"skip_initial_bytes", "set number of bytes to skip before reading header and frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX-1, D},
 {"correct_ts_overflow", "correct single timestamp overflows", OFFSET(correct_ts_overflow), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, D},
 {"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E},
 {"metadata_header_padding", "set number of bytes to be written as padding in a metadata header", OFFSET(metadata_header_padding), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, E},



More information about the ffmpeg-cvslog mailing list