Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:08:38 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:08:38 +0000 (10:08 +0200)
commitada9b17e7a3d63b5c58d493006d7b17aa2617813
treee80c33fea9a15626b97145a6ea2d61c009552f11
parent16ae64ce244a975dc160bef30905de27a8dd34aa
parent8b524ab0c43c1767919530abb79d3656113cdc47
Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
  movenc: Add a warning message if conflicting options have been specified

Conflicts:
libavformat/movenc.c

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