aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Stone <a@stoney.io>2015-08-31 20:28:42 -0400
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-01 13:35:37 +0200
commitdc926ab518a30880c9e8dd9ec26c74d5e9aa6182 (patch)
tree5a28eb44237b572c247337b784d697d1fe9bcedb
parent8ffe1cb4d7d457fdd216f42fec068fbd0cbc7ade (diff)
downloadffmpeg-dc926ab518a30880c9e8dd9ec26c74d5e9aa6182.tar.gz
rtmp: support the AMF_DATE tag
Instead of returning EINVAL, which can cause a stream to fail to load, this allows the tag to be passed through to the flv demuxer, where it's summarily ignored. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/rtmppkt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index c474fb3d58..0d693c27f7 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -440,6 +440,7 @@ int ff_amf_tag_size(const uint8_t *data, const uint8_t *data_end)
case AMF_DATA_TYPE_STRING: return 3 + AV_RB16(data);
case AMF_DATA_TYPE_LONG_STRING: return 5 + AV_RB32(data);
case AMF_DATA_TYPE_NULL: return 1;
+ case AMF_DATA_TYPE_DATE: return 11;
case AMF_DATA_TYPE_ARRAY:
parse_key = 0;
case AMF_DATA_TYPE_MIXEDARRAY: