diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 16:31:16 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 16:31:35 +0100 |
commit | f8b09e90e92ca74c664d661c4f459bfa1d6383b5 (patch) | |
tree | 3425abd30a019ee70276689aaba3c82e92586613 /libavformat/wc3movie.c | |
parent | d3e1c6f975021ef5a096faa2d27e42922def63fb (diff) | |
parent | 39a2d3288e82e4e576c03efb32179ef5a19fff50 (diff) | |
download | ffmpeg-f8b09e90e92ca74c664d661c4f459bfa1d6383b5.tar.gz |
Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
This commit is a no-op. Ours are not identical / refactorable.
* commit '39a2d3288e82e4e576c03efb32179ef5a19fff50':
mpegvideo: Refactor emulated_edge_mc calls
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/wc3movie.c')
0 files changed, 0 insertions, 0 deletions