[FFmpeg-cvslog] Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Fri Jun 24 10:44:57 2016 +0200| [9c4af99583a11354c005f10d095232ff1a4276c4] | committer: Clément Bœsch

Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'

* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
  mov: Print reason of loci parsing failure

See 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9

Merged-by: Clément Bœsch <clement at stupeflix.com>

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

 libavformat/mov.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7126295..c7caf80 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -243,7 +243,8 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
     len -= 1;
 
     if (len < 12) {
-        av_log(c->fc, AV_LOG_ERROR, "no space for coordinates left (%d)\n", len);
+        av_log(c->fc, AV_LOG_ERROR,
+               "loci too short (%u bytes left, need at least %d)\n", len, 12);
         return AVERROR_INVALIDDATA;
     }
     longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);


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

diff --cc libavformat/mov.c
index 7126295,fc57399..c7caf80
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -242,8 -244,9 +242,9 @@@ static int mov_metadata_loci(MOVContex
      avio_skip(pb, 1); // role
      len -= 1;
  
 -    if (len < 14) {
 +    if (len < 12) {
-         av_log(c->fc, AV_LOG_ERROR, "no space for coordinates left (%d)\n", len);
+         av_log(c->fc, AV_LOG_ERROR,
 -               "loci too short (%u bytes left, need at least %d)\n", len, 14);
++               "loci too short (%u bytes left, need at least %d)\n", len, 12);
          return AVERROR_INVALIDDATA;
      }
      longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);