diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:40:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:40:30 +0100 |
| commit | d9bb7fc3cb18fbce3a0ddc18541d5537b2e8d9a4 (patch) | |
| tree | a5e668a62e5fdfc9407c065cf8d74ae3f2efed71 /libavutil/hmac.c | |
| parent | 493f750e7a50f93de0cc972f6f0233b685253a3f (diff) | |
| parent | 816e5b997028c8215c804b1e58b2388592ed612b (diff) | |
| download | ffmpeg-d9bb7fc3cb18fbce3a0ddc18541d5537b2e8d9a4.tar.gz | |
Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'
* commit '816e5b997028c8215c804b1e58b2388592ed612b':
hevc: Reject impossible slice segment
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/hmac.c')
0 files changed, 0 insertions, 0 deletions