Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 16:03:49 +0000 (18:03 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 16:03:49 +0000 (18:03 +0200)
commitd671652f6e929e01442a6a8cc5c7745451160919
treef900423f3cb0935d8f714822ac276cbbbcad477c
parentdc62016c4b77a48284b24ad927eb68035b133925
parentfd4957d9c67996e7d218fd36b4168c9cb85f9ea7
Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'

* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
  movenc-test: Test write_data_type

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
libavformat/tests/movenc.c
tests/ref/fate/movenc