eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
15fbf3e72a643b6b3d32ab6fa687ca2ca3d2fde1
ffmpeg/ffmpeg.c
Michael Niedermayer 15fbf3e72a Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5' 
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
  avconv: factor out the output stream initialization

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 13:50:33 +02:00

148 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink