diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-01 13:06:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-11-01 13:06:25 +0100 |
| commit | 0ddcee172ec8a8abc91c61c3a66bbfd432373976 (patch) | |
| tree | 1e4db2cfc0356f93d88fa9858a5d49618f4a2435 /libavcodec/resample.c | |
| parent | 13ecdb06f8503c852546b017e7e861e10d9f416f (diff) | |
| parent | 0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b (diff) | |
Merge commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b' into release/2.4
* commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b':
hevc_mvs: make sure to always initialize the temporal MV fully
Conflicts:
libavcodec/hevc_mvs.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions