Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:45:55 +0000 (02:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:53:52 +0000 (02:53 +0100)
commit7f24e1e1a2a95fa56301ac5f5463decb83cbcb68
tree76045e1b5910b3391f92310a7f5a60822d37aae7
parentbe787bccc00c0da482e99315dd7b155c575aa159
parent600d5ee6b12bad144756b0772319bb04796bc528
Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

* commit '600d5ee6b12bad144756b0772319bb04796bc528':
  movenc: Signal iso6 in compatible_brands when using tfdt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
tests/ref/fate/sub-movtextenc
tests/ref/lavf/ismv