]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 746095b b977b28)
Merge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:58:17 +0000 (19:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:58:17 +0000 (19:58 +0200)
* commit 'b977b287f61fea48ecd6251d54a26334213b7ec6':
  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: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.