diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:13:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:17:36 +0200 |
| commit | 127f7aa401c90f755963ddd3efa425998b025946 (patch) | |
| tree | 4c76be5d0ba5ab7d7a043fe7eb4228b6f32b033a /libavformat/gopher.c | |
| parent | 4d50d53a6d604043b1020945f603a8adfc6a67cc (diff) | |
| parent | 4d593896aaa81356def8993e8c52294bd8bb2797 (diff) | |
| download | ffmpeg-127f7aa401c90f755963ddd3efa425998b025946.tar.gz | |
Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797'
* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()
Conflicts:
libavcodec/vc1_pred.c
See: 6c5bd7d785ffb796b8cfbae677ab54755b26a22b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/gopher.c')
0 files changed, 0 insertions, 0 deletions