avformat/AVFormatContext: Move fields down to match the fork