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

Merge commit '56c2f377' 


* commit '56c2f377':
  avconv: drop update_sample_fmt()

Conflicts:
	ffmpeg.c

No change as the removed code is not in FFmpeg

Merged-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parents 3d4297f8 56c2f377
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 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