eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
aba61b22f70ff5407cd5ff1f797fff42dee07359
ffmpeg/ffmpeg.c
Michael Niedermayer 137f7a630b Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a' 
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:56:44 +02:00

137 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink