Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 03:05:56 +0000 (04:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 03:05:56 +0000 (04:05 +0100)
commitefe259a27e56ae2f68b924a7d24b08b69b3badc8
tree0ab9c9ba528b0c7a02c0bb3834f1933780f5436b
parent49f11e12d5afa9cd800f3e2f753d83595d5cff5c
parent29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85
Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2

* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h