Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 12:17:54 +0000 (14:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 12:52:03 +0000 (14:52 +0200)
commit2b7f595aca84d421767e9755ce81d8a621898264
tree4d9387b90de010612d24e872119fd53c948bb41d
parent22dc25cb29ab7b84d6d03f56766a15b6556a7b11
parent76d23f40314fc1dcd74a3d470b17782cc0ee5a3a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c