diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 14:28:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 14:28:49 +0200 |
| commit | 454920187f152fc9d058225095cc8291c55c4f4a (patch) | |
| tree | d2f480423d88b11c95d329549f50eaaf28db8e97 /libavformat/allformats.c | |
| parent | 8447658550006996d30e232b1d77614c92a4cc5e (diff) | |
| parent | 4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7 (diff) | |
| download | ffmpeg-454920187f152fc9d058225095cc8291c55c4f4a.tar.gz | |
Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'
* commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7':
hevc/intra_pred: optimize EXTEND_()*
Conflicts:
libavcodec/hevcpred_template.c
See: 053fdacde76a38186dc9db658572e38686efe0c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions