diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 5 | ||||
| -rw-r--r-- | libavformat/nut.c | 6 | ||||
| -rw-r--r-- | libavformat/oma.h | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 0fa472d0a2..3f154796fa 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -762,7 +762,8 @@ static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf if (cts != AV_NOPTS_VALUE) pes->pts = cts; - avpriv_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res); + if (sl->timestamp_len && sl->timestamp_res) + avpriv_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res); return (get_bits_count(&gb) + 7) >> 3; } @@ -1496,7 +1497,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (idx >= 0) { st = ts->stream->streams[idx]; } else { - st = avformat_new_stream(pes->stream, NULL); + st = avformat_new_stream(ts->stream, NULL); st->id = pid; st->codec->codec_type = AVMEDIA_TYPE_DATA; } diff --git a/libavformat/nut.c b/libavformat/nut.c index 2a5e6fe567..0a44811c57 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -70,6 +70,12 @@ const AVCodecTag ff_nut_video_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, { CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, + { CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, + { CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, + { CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, diff --git a/libavformat/oma.h b/libavformat/oma.h index 2830b34673..bac8bcb736 100644 --- a/libavformat/oma.h +++ b/libavformat/oma.h @@ -21,6 +21,10 @@ #ifndef AVFORMAT_OMA_H #define AVFORMAT_OMA_H +#include <stdint.h> + +#include "internal.h" + #define EA3_HEADER_SIZE 96 #define ID3v2_EA3_MAGIC "ea3" #define OMA_ENC_HEADER_SIZE 16 @@ -36,4 +40,5 @@ enum { extern const uint16_t ff_oma_srate_tab[6]; extern const AVCodecTag ff_oma_codec_tags[]; -#endif + +#endif /* AVFORMAT_OMA_H */ |