Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'

* commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14':
  mov: expand the list of parsed metadata tags

Conflicts:
	libavformat/mov.c

See: 543f3db9784348499a1ac1088373e2fb9100d4c0
See: dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/mov.c
index 386371043c12e10d72d15654a4b5544182cfb4f4,44e26fea5ab85514b0b41120875a810d70015568..6633a4153e6290f81b0a5c50f1666ffbcf77494c
--- 1/libavformat/mov.c
--- 2/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -299,9 -321,8 +317,10 @@@ static int mov_read_udta_string(MOVCont
      case MKTAG(0xa9,'g','r','p'): key = "grouping";  break;
      case MKTAG(0xa9,'i','n','f'): key = "comment";   break;
      case MKTAG(0xa9,'l','y','r'): key = "lyrics";    break;
 +    case MKTAG(0xa9,'m','a','k'): key = "make";      break;
 +    case MKTAG(0xa9,'m','o','d'): key = "model";     break;
      case MKTAG(0xa9,'n','a','m'): key = "title";     break;
+     case MKTAG(0xa9,'s','t','3'): key = "subtitle";  break;
      case MKTAG(0xa9,'s','w','r'): key = "encoder";   break;
      case MKTAG(0xa9,'t','o','o'): key = "encoder";   break;
      case MKTAG(0xa9,'w','r','t'): key = "composer";  break;