diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:52:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:52:49 +0200 |
| commit | 980aa2ae355d6dc93384d23440ea53c57254a08b (patch) | |
| tree | 6f03a3363d67891074e6f8cd64fb9fc1bc46c3c4 /libswresample/resample_template.c | |
| parent | 17cbc6457b7a0c38fececc3e0ecff99cc8c96526 (diff) | |
| parent | 14ca0aa69b5d954ce56d0826ab9f1f70e535c92a (diff) | |
| download | ffmpeg-980aa2ae355d6dc93384d23440ea53c57254a08b.tar.gz | |
Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'
* commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a':
hevc: wait proper position for tmvp
Conflicts:
libavcodec/hevc_mvs.c
See: ed248e7f70d98abe099392e154d1cdd0f15faa3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions