diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 14:01:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 14:01:21 +0200 |
| commit | a80342fe5633303a72d357c0bd9419bf3962dfdb (patch) | |
| tree | a4ab09c65fb05523f2e1f1677131305cb76caffb | |
| parent | adf4ee40e7376d63d9c557e0e3e0e440e1144405 (diff) | |
| parent | d58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9 (diff) | |
| download | ffmpeg-a80342fe5633303a72d357c0bd9419bf3962dfdb.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow >2G for skip_initial_bytes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/options_table.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 01c3b75c37..e56a0bca41 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 069edee0d6..36c0426bd1 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}, |