Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:20:11 +0000 (10:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:20:11 +0000 (10:20 +0200)
commit46405813c3c15caf8cee1cf9fa2bbaeead35c7cd
tree43fd6900bac0a64ec18e5fe0d373575492c4a691
parentada9b17e7a3d63b5c58d493006d7b17aa2617813
parentbdf990425e2be6912a6d29f032ca558448c8635a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
libavformat/movenc.c

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