eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 02:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
6c5a57db94b50f091cd56b09cf537b68ebfe50f4
ffmpeg/ffmpeg.c
Michael Niedermayer 62899d79a3 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>
2014-06-20 01:11:54 +02:00

113 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink