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)
commitb1cf83b3d4e83b5e7d80ef7262039d1ef0e626e2
tree398aa4126677aef21691a4c86cbffe6af0824abd
parent746095bc29817875ac89a7d4771f8a54895b3cbb
parentb977b287f61fea48ecd6251d54a26334213b7ec6
Merge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6'

* 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>