Skip to content
Snippets Groups Projects
Commit 608d8601 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'e19e8aee' 


* commit 'e19e8aee':
  avtools: move media_type_string() from avprobe to cmdutils.

Conflicts:
	avprobe.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3dedcef8 e19e8aee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment