Commit b1cf83b3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b977b287'

* commit 'b977b287':
  vsrc_movie: Avoid a variable indirection in movie_get_frame()

Conflicts:
	libavfilter/src_movie.c

no change as theres no such code in src_movie.c in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 746095bc b977b287
Markdown is supported
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