eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-21 22:40:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
092ee6cd32e45d7069555c6e5cc0f043328826c2
ffmpeg/ffmpeg_opt.c
Michael Niedermayer 15cd2a93e7 Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992' 
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

See: 7efabffc28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:00:04 +01:00

122 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink