eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-04-30 08:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
06d8fdb660fdb2ca18dffa3aa92e40d2a7909b95
ffmpeg/ffmpeg_opt.c
Michael Niedermayer 2b7f595aca 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>
2013-05-03 14:52:03 +02:00

109 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink