[FFmpeg-cvslog] Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'

Michael Niedermayer git at videolan.org
Fri Apr 4 02:53:18 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  4 02:32:16 2014 +0200| [1946ad4d8c089fcdd8aa82b0cd25e52d4443c1b7] | committer: Michael Niedermayer

Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'

* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
	libavformat/isom.c

See: ca8623e1a537fa48366efebdf235442f1197bb71
See: 8a3f976498cc096644b95ade7240a73e17d3a042
See: fca62f05005567514b5daaea230ba9365e202201
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list