eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 09:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1047c286fa20c79dde8ddd7577a3b87cc1effdb7
ffmpeg/cmdutils.c
Michael Niedermayer ee025a0c61 Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4 
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3ca81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 00:38:44 +01:00

65 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink