eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c388db185c8034d8cb00cb83e61dbc8d2805628f
ffmpeg/cmdutils.c
Michael Niedermayer cdfd61b78b Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10 
* commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a':
  cmdutils: Conditionally compile libswscale-related bits

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 19:15:49 +02:00

38 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink