ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Dec 16 
02:23:43 2014 +0100| [1a86e29ff0bcd5ecbd97057418f7f7dd814c5d9c] | committer: 
Michael Niedermayer

Merge commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40'

* commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40':
  mov: Fix handling of zero-length metadata values

Conflicts:
        libavformat/mov.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to