Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 23:11:54 +0000 (01:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 23:11:54 +0000 (01:11 +0200)
commit62899d79a380aadd95793beb096e74eb9c8b8776
tree1bb5daa29f9f3eda3621d9aaf62963afb17b34df
parent45283653a30e33a8ef0e35f2f6f502de2f93ce22
parentba8ab4e7ae016cf970b0f335a7933f2db53784bc
Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

* commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc':
  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