dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-18 05:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
bbc19010edfdb1b2e248a24894c5ec77960bbfc3
FFmpeg/cmdutils.h
Michael Niedermayer 608d86013a Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
  avtools: move media_type_string() from avprobe to cmdutils.

Conflicts:
	avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:56:20 +02:00

18 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink