ffmpeg.c · ed3efbcd0c84669a635d1243282fb3283a4b5c3a · Samuel Mira / ffmpeg

10 years ago

Michael Niedermayer authored 10 years ago


* commit '557d4c4e':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

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

137f7a63

History

Merge commit ''

Michael Niedermayer authored 10 years ago


* commit '557d4c4e':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

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