diff options
author | James Almer <jamrial@gmail.com> | 2017-11-11 00:28:53 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-11 00:28:53 -0300 |
commit | 73198aca2c27712e45f29dec769f4c343ee40c20 (patch) | |
tree | 0873ce3eae0573a4509bc132decb0edd75c3001b /libavcodec/vaapi_encode_mjpeg.c | |
parent | 27604549456282102eadbcb920b9a64775c683e1 (diff) | |
parent | defe307fb22beca60a632e976ab97e5edd4aee25 (diff) | |
download | ffmpeg-73198aca2c27712e45f29dec769f4c343ee40c20.tar.gz |
Merge commit 'defe307fb22beca60a632e976ab97e5edd4aee25'
* commit 'defe307fb22beca60a632e976ab97e5edd4aee25':
mov: move stsd finalization to an appropriate place
mov: Do not set stsd_count if mov_read_stsd() fails
mov: log and return early on non-positive stsd entry counts
See 8b43ee4054af799e388d380b379a13a60849c1b5
656feb641de3cd5b9cb4e33ffd3f0ad4664c36d2
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vaapi_encode_mjpeg.c')
0 files changed, 0 insertions, 0 deletions