[FFmpeg-cvslog] avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 15:47:33 2014 +0200| [2dbee1a3935a91842c22eb65fd13f77e8d590e07] | committer: Michael Niedermayer

avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mp3enc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 713dcd1..a691f75 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -231,7 +231,12 @@ static int mp3_write_xing(AVFormatContext *s)
     // encoder short version string
     if (enc) {
         uint8_t encoder_str[9] = { 0 };
-        memcpy(encoder_str, enc->value, FFMIN(strlen(enc->value), sizeof(encoder_str)));
+        if (   strlen(enc->value) > sizeof(encoder_str)
+            && !strcmp("Lavc libmp3lame", enc->value)) {
+            memcpy(encoder_str, "Lavf lame", 9);
+        } else
+            memcpy(encoder_str, enc->value, FFMIN(strlen(enc->value), sizeof(encoder_str)));
+
         avio_write(dyn_ctx, encoder_str, sizeof(encoder_str));
     } else
         avio_write(dyn_ctx, "Lavf\0\0\0\0\0", 9);