virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00
Code Issues Releases Activity
Files
df06cb561102488f09c9ef24494cc7dd843cad1a
FFmpeg/libavutil/parseutils.c
Michael Niedermayer be0fd07457 Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b' 
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 16:55:39 +02:00

28 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink