Michael Niedermayer 1946ad4d8c Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4' ...

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

Conflicts:
	libavformat/isom.c

See: ca8623e1a5
See: 8a3f976498
See: fca62f0500
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-04 02:44:56 +02:00

30 KiB

Raw Blame History

View Raw