[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 14:17:54 2013 +0200| [2b7f595aca84d421767e9755ce81d8a621898264] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b7f595aca84d421767e9755ce81d8a621898264
---