Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 10:02:05 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 10:05:48 +0000 (12:05 +0200)
commit76424b2da8506be50ea95e0b415f154054f0d2d1
tree44894f9bb6f83f191e55d00ac86873a0342edad1
parentb36257921e5282c3069e1b5c6e7e758e566c7337
parente01fba5562133ac56a4f44c6f214a80ee33cb388
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h

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