Merge "mp4: fix potential dereferences of NULL"