eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 11:30:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
89d2fc62db985263fdbfb1f44b23e98d24d77c9e
ffmpeg/ffmpeg.c
Michael Niedermayer d5ec1ddf7b Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 
* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:51:55 +02:00

133 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink