diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 21:01:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 21:01:55 +0200 |
commit | 3f2495d98c260e6ea836d2f8e0b8e093983e8337 (patch) | |
tree | b97928b22b254cd742bb15ef6cc7d26aa008679f /libavformat/rtpenc_chain.c | |
parent | 73e9d4cd6fa6fb627f0cf0affb91fa7dac7f9c68 (diff) | |
parent | 70211539a39ca3854f8a9e97d51dc27caa079943 (diff) | |
download | ffmpeg-3f2495d98c260e6ea836d2f8e0b8e093983e8337.tar.gz |
Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'
* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
hevc: deobfuscate slice/tile boundary handling for DBF
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
See: a5c621aa852522c79146035b2db4b89d2e096d3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_chain.c')
0 files changed, 0 insertions, 0 deletions