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

Merge commit '63d744e2' 


* commit '63d744e2':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
	libavcodec/aacdec.c
	libavcodec/tta.c
	libavformat/mpegts.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 905e7eb4 63d744e2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 22 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