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

Merge commit '9abc80f1' 


* commit '9abc80f1':
  libavcodec: Make use of av_clip functions

Conflicts:
	libavcodec/takdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1253091d 9abc80f1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 32 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