Merge commit 'defe307fb22beca60a632e976ab97e5edd4aee25'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 03:28:53 +0000 (00:28 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 03:28:53 +0000 (00:28 -0300)
* 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>
1  2 
libavformat/mov.c

Simple merge