Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 00:32:16 +0000 (02:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 00:44:56 +0000 (02:44 +0200)
* 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@gmx.at>
1  2 
libavformat/isom.c

Simple merge