[FFmpeg-cvslog] avformat/aadec: use avio_get_str()

Paul B Mahol git at videolan.org
Mon Jan 16 11:25:26 EET 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Jan 16 10:07:14 2017 +0100| [591be9e38443a01cea88db787be8a5c9a66c43a2] | committer: Paul B Mahol

avformat/aadec: use avio_get_str()

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavformat/aadec.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libavformat/aadec.c b/libavformat/aadec.c
index fa4e662..39dea40 100644
--- a/libavformat/aadec.c
+++ b/libavformat/aadec.c
@@ -102,16 +102,8 @@ static int aa_read_header(AVFormatContext *s)
         avio_skip(pb, 1); // unidentified integer
         nkey = avio_rb32(pb); // key string length
         nval = avio_rb32(pb); // value string length
-        if (nkey > sizeof(key)) {
-            avio_skip(pb, nkey);
-        } else {
-            avio_read(pb, key, nkey); // key string
-        }
-        if (nval > sizeof(val)) {
-            avio_skip(pb, nval);
-        } else {
-            avio_read(pb, val, nval); // value string
-        }
+        avio_get_str(pb, nkey, key, sizeof(key));
+        avio_get_str(pb, nval, val, sizeof(val));
         if (!strcmp(key, "codec")) {
             av_log(s, AV_LOG_DEBUG, "Codec is <%s>\n", val);
             strncpy(codec_name, val, sizeof(codec_name) - 1);



More information about the ffmpeg-cvslog mailing list