[FFmpeg-cvslog] Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'

Clément Bœsch git at videolan.org
Fri Jun 24 10:43:38 CEST 2016


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

Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'

* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
  mov: Add a comment referring to the standard that defines the loci box

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

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

 libavformat/mov.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index d75605d..7126295 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -215,6 +215,7 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len)
     return 0;
 }
 
+// 3GPP TS 26.244
 static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
 {
     char language[4] = { 0 };


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




More information about the ffmpeg-cvslog mailing list