[FFmpeg-cvslog] Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 16:37:31 2017 +0100| [ddcd396075df5134491bc128c41c034898291cdb] | committer: Clément Bœsch

Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'

* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddcd396075df5134491bc128c41c034898291cdb
---

 libavformat/rtmpproto.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index ef2772e..aa1cd8f 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1909,9 +1909,6 @@ static int write_status(URLContext *s, RTMPPacket *pkt,
     ff_amf_write_string(&pp, statusmsg);
     ff_amf_write_field_name(&pp, "details");
     ff_amf_write_string(&pp, filename);
-    ff_amf_write_field_name(&pp, "clientid");
-    snprintf(statusmsg, sizeof(statusmsg), "%s", LIBAVFORMAT_IDENT);
-    ff_amf_write_string(&pp, statusmsg);
     ff_amf_write_object_end(&pp);
 
     spkt.size = pp - spkt.data;


======================================================================