diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:10:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:10:05 +0100 |
| commit | c849b00b804cc02b6d68e02d8f7814369118bb83 (patch) | |
| tree | 58028f9d5b4c7aa4ece411c6f977f059e4c587c9 | |
| parent | 6a24d77929e0d5425c79a081034719ac68199602 (diff) | |
| parent | 8370a6fa59429e420999a738bc6c0d5a6ac4003a (diff) | |
| download | ffmpeg-c849b00b804cc02b6d68e02d8f7814369118bb83.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavformat/mpegts: expose raw packet size
Conflicts:
libavformat/mpegts.c
See: f9b997c337873dad99f7fd505588b260febaf32b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 4eb8c4f155..a7819ca97a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -146,7 +146,7 @@ static const AVOption mpegtsraw_options[] = { {"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, {"ts_packetsize", "Output option carrying the raw packet size.", offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT, - {.i64 = 0}, 0, 0, AV_OPT_FLAG_METADATA }, + {.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { NULL }, }; @@ -161,7 +161,7 @@ static const AVOption mpegts_options[] = { {"fix_teletext_pts", "Try to fix pts values of dvb teletext streams.", offsetof(MpegTSContext, fix_teletext_pts), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, {"ts_packetsize", "Output option carrying the raw packet size.", offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT, - {.i64 = 0}, 0, 0, AV_OPT_FLAG_METADATA }, + {.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { NULL }, }; |