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

Merge commit '1ecdf891' 


* commit '1ecdf891':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
	libavformat/mxfdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents fa92ee82 1ecdf891
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 37 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