Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 11:23:36 +0000 (13:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 11:32:55 +0000 (13:32 +0200)
commitb7e7d8cdaf3aafd9b79daa8f6ed827d05e3f8548
treefe49680e5686614c81dc0b959372f1c7c042d1db
parent394a73cad2ed0933a68f10ee720a641c7192fa15
parente7bf085b78586a04b918f4e76587779d04674700
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add an option for omitting the tfhd base offset

Conflicts:
libavformat/version.h

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