From d9b89b23df4f63d67694507f3d1caee62424a9d8 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 19 Dec 2011 10:41:22 -0800 Subject: mpegts: Fix typo in handling sections in the PMT. This was an error rebasing 4682a1dc3aa2554ad7077f5db32d0f2d598d018e for commit. The "pes" variable guaranteed to be NULL in that block. --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ca01003d80..2356fa8935 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1460,7 +1460,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; } -- cgit v1.2.3 From 41bdd4adc4ab90a5ef7d63050a4046fcba711365 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 19 Dec 2011 10:48:57 -0800 Subject: mpegts: Suppress invalid timebase warnings on DMB streams. timestamp_len and timestamp_res intialize to zero. --- libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 2356fa8935..15688a9747 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -732,7 +732,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; } -- cgit v1.2.3 From a55eb1586c3a0361d1ced1ba9d32e11b68441c29 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 20 Dec 2011 15:38:18 +0100 Subject: oma: make header compile standalone --- libavformat/oma.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavformat') 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 + +#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 */ -- cgit v1.2.3 From 432f0e5b7d2329976ef7aee05d990c7462efd0ee Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 4 Dec 2011 15:56:39 +0100 Subject: nut: support 10bit YUV Signed-off-by: Luca Barbato --- libavformat/nut.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavformat') diff --git a/libavformat/nut.c b/libavformat/nut.c index 1ce048d645..ac62d4ff4c 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 ) }, -- cgit v1.2.3