summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-06-06 00:05:31 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-06-06 09:16:53 +0200
commitd58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9 (patch)
tree691d8f716fa76c72e9b47de8e40f5bff09f61acb /libavformat
parentec98f80af47d2f463c5c3c59aa36c5aaf74204c5 (diff)
downloadffmpeg-streaming-d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9.zip
ffmpeg-streaming-d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9.tar.gz
Allow >2G for skip_initial_bytes.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h2
-rw-r--r--libavformat/options_table.h2
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},
OpenPOWER on IntegriCloud