ffmpeg.c · 2b7f595aca84d421767e9755ce81d8a621898264 · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


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

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2b7f595a

Michael Niedermayer authored 11 years ago


* 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 119.25 KiB